diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:43:00 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:43:00 -0800 |
| commit | c3ca95dad25ba575142afd138c8464b950ce9cb6 (patch) | |
| tree | e56187f0ee1d7c1699684a1a5d92faf398b2580f /ext/imap/php_imap.c | |
| parent | 51004a9c5ee95644d935ee79568c2c38e6a4baab (diff) | |
| parent | 3d8d13f7b90960ab017f391a5ba21b805fbdbcc4 (diff) | |
| download | php-git-c3ca95dad25ba575142afd138c8464b950ce9cb6.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
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 2863657827..e88318e6f7 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4113,7 +4113,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, |