diff options
| author | Anatol Belski <ab@php.net> | 2016-08-20 01:37:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-20 01:37:26 +0200 |
| commit | a569b8816b0da373eece2b785aaaeefd3bbf32a7 (patch) | |
| tree | 3f7b0b2ea71e82f3d94f30e885da067eb9b88e82 /ext/imap/php_imap.c | |
| parent | 61344c6d662374ba1ab7988c7fa1b3ccd4414cde (diff) | |
| parent | f682193609a1f511b7cb405a02746d44032bf8de (diff) | |
| download | php-git-a569b8816b0da373eece2b785aaaeefd3bbf32a7.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Fixed bug #72852 imap_mail null dereference
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 2ce1070838..5cfc8adf14 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -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; |