diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:45 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:45 -0800 |
| commit | 8ab5d22332b4fbb9b683bac36ce0b5ebc5501794 (patch) | |
| tree | e3c4bd9828e3a325cd756882dd6a287f9b01e7e6 /ext/imap/php_imap.c | |
| parent | 61af343768edd7f72219f9d328cde44697ad5cf3 (diff) | |
| parent | 5718d73dbbca4a1940fef48749ae8c43cc4157a0 (diff) | |
| download | php-git-8ab5d22332b4fbb9b683bac36ce0b5ebc5501794.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 3a343b31b7..6ce4b78179 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4128,7 +4128,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, |