mirror of
https://github.com/php/php-src.git
synced 2024-12-14 12:26:19 +08:00
Merge branch 'PHP-7.1'
* PHP-7.1: fix possible NULL dereference
This commit is contained in:
commit
fa0df0cdc5
@ -292,7 +292,7 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
|
||||
PW32G(mail_host), !INI_INT("smtp_port") ? 25 : INI_INT("smtp_port"));
|
||||
return FAILURE;
|
||||
} else {
|
||||
ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data, ZSTR_VAL(headers_trim), ZSTR_VAL(headers_lc), error_message);
|
||||
ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data, headers ? ZSTR_VAL(headers_trim) : NULL, headers ? ZSTR_VAL(headers_lc) : NULL, error_message);
|
||||
TSMClose();
|
||||
if (RPath) {
|
||||
efree(RPath);
|
||||
|
Loading…
Reference in New Issue
Block a user