diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:39:03 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-03 00:39:03 -0800 |
| commit | 66a0f061f62410ccab6420ea1ccfc6b7652c7e83 (patch) | |
| tree | 26718176d2d4436ebdd8cacd1055a7660d2e40a9 /ext/imap | |
| parent | 6e3f5d57d48c5aa5c50a3990b2ebf9dea56f2803 (diff) | |
| parent | 54212674b924aab506471060ff64986cda375f71 (diff) | |
| download | php-git-66a0f061f62410ccab6420ea1ccfc6b7652c7e83.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Diffstat (limited to 'ext/imap')
| -rw-r--r-- | ext/imap/php_imap.c | 1 | ||||
| -rw-r--r-- | ext/imap/tests/bug77020.phpt | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 33a68a7a18..011cbc0dfd 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, diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt new file mode 100644 index 0000000000..8a65232eec --- /dev/null +++ b/ext/imap/tests/bug77020.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #77020 (null pointer dereference in imap_mail) +--SKIPIF-- +<?php +if (!extension_loaded('imap')) die('skip imap extension not available'); +?> +--FILE-- +<?php +imap_mail('1', 1, NULL); +?> +===DONE=== +--EXPECTF-- +Warning: imap_mail(): No message string in mail command in %s on line %d +%s +===DONE=== |