diff options
| author | Anatol Belski <ab@php.net> | 2016-08-20 01:38:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-20 01:38:30 +0200 |
| commit | f61358289861553239564a9ab37b0e76e2e74aa1 (patch) | |
| tree | b00bd1fa0ecf9813ba907c35cef56de9ca930b20 /ext/imap | |
| parent | ae92977191d5656f2ba303e9bbfcd0b2716b4244 (diff) | |
| parent | a556543a3fb68fb18eeaa4d5bc58032e90e383dc (diff) | |
| download | php-git-f61358289861553239564a9ab37b0e76e2e74aa1.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
update NEWS
Fixed bug #72852 imap_mail null dereference
Diffstat (limited to 'ext/imap')
| -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 39d7fbb1ca..9416a7e34d 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; |