mirror of
https://github.com/php/php-src.git
synced 2024-12-17 13:59:28 +08:00
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: update NEWS Fixed bug #72852 imap_mail null dereference
This commit is contained in:
commit
a569b8816b
@ -3962,7 +3962,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
|
||||
bt_len++;
|
||||
offset = 0;
|
||||
addr = NULL;
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, "NO HOST");
|
||||
while (addr) {
|
||||
if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
|
||||
PHP_IMAP_BAD_DEST;
|
||||
@ -3991,7 +3991,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
|
||||
bt_len++;
|
||||
offset = 0;
|
||||
addr = NULL;
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, "NO HOST");
|
||||
while (addr) {
|
||||
if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
|
||||
PHP_IMAP_BAD_DEST;
|
||||
@ -4017,7 +4017,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
|
||||
bt_len++;
|
||||
offset = 0;
|
||||
addr = NULL;
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, NULL);
|
||||
rfc822_parse_adrlist(&addr, tempMailTo, "NO HOST");
|
||||
while (addr) {
|
||||
if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
|
||||
PHP_IMAP_BAD_DEST;
|
||||
|
Loading…
Reference in New Issue
Block a user