Merge branch 'PHP-7.1'

* PHP-7.1: fix possible NULL dereference
9 years ago · fa0df0cdc5
1 changed files with 1 additions and 1 deletions
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@ -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);