diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:50 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:50 -0800 |
| commit | 8fff90250bebaef0ffbf37008358f4db5a68dd50 (patch) | |
| tree | 50976da5069c46ffbfee95780fb48978ee8a1e4b /ext/imap/php_imap.c | |
| parent | 1f78b1dfd0711c3f3659965abd19862bb4706b19 (diff) | |
| parent | 8ab5d22332b4fbb9b683bac36ce0b5ebc5501794 (diff) | |
| download | php-git-8fff90250bebaef0ffbf37008358f4db5a68dd50.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77143 - add more checks to buffer reads
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 87fa447bc6..37eb5e1296 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4125,7 +4125,6 @@ PHP_FUNCTION(imap_mail) if (!ZSTR_LEN(message)) { /* this is not really an error, so it is allowed. */ php_error_docref(NULL, E_WARNING, "No message string in mail command"); - message = NULL; } if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL, |