diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:55 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:42:55 -0800 |
| commit | 3d8d13f7b90960ab017f391a5ba21b805fbdbcc4 (patch) | |
| tree | 9516864483d238d4d696bd30ebf2c834fe7c04e3 /ext/imap/php_imap.c | |
| parent | 1deee2ba7cfaa93f1d49d0394401138ce23f36c6 (diff) | |
| parent | 8fff90250bebaef0ffbf37008358f4db5a68dd50 (diff) | |
| download | php-git-3d8d13f7b90960ab017f391a5ba21b805fbdbcc4.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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
Don't need interactive progress on git clones in Travis
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
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 9e626a4cfa..01d1a5f80c 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4116,7 +4116,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, |