diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 19:01:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 19:02:15 +0200 |
| commit | edd8bd64ba78ac2a22da0fbc04559d9d55d30fa8 (patch) | |
| tree | 2bb0253b93de18cba186e33979d405d27ef80688 | |
| parent | d5f92baad00ce19e096f9936a4ffdcf5c3cd1383 (diff) | |
| parent | 4ef7be20abf565e902ae98490d1878aa384e2356 (diff) | |
| download | php-git-edd8bd64ba78ac2a22da0fbc04559d9d55d30fa8.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 22 | ||||
| -rw-r--r-- | ext/imap/tests/bug80242.phpt | 22 |
3 files changed, 37 insertions, 9 deletions
@@ -9,6 +9,8 @@ PHP NEWS - IMAP: . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb) . Fixed minor regression caused by fixing bug #80220. (cmb) + . Fixed bug #80242 (imap_mail_compose() segfaults for multipart with rfc822). + (cmb) - Opcache: . Fixed bug #80255 (Opcache bug (bad condition result) in 8.0.0rc1). (Nikita) diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index b13ce204fb..258bd5bb9c 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3375,15 +3375,19 @@ PHP_FUNCTION(imap_mail_compose) bod->disposition.parameter = disp_param; } } - if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "contents.data", sizeof("contents.data") - 1)) != NULL) { - convert_to_string_ex(pvalue); - bod->contents.text.data = fs_get(Z_STRLEN_P(pvalue) + 1); - memcpy(bod->contents.text.data, Z_STRVAL_P(pvalue), Z_STRLEN_P(pvalue) + 1); - bod->contents.text.size = Z_STRLEN_P(pvalue); + if (bod->type == TYPEMESSAGE && bod->subtype && !strcmp(bod->subtype, "RFC822")) { + bod->nested.msg = mail_newmsg(); } else { - bod->contents.text.data = fs_get(1); - memcpy(bod->contents.text.data, "", 1); - bod->contents.text.size = 0; + if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "contents.data", sizeof("contents.data") - 1)) != NULL) { + convert_to_string_ex(pvalue); + bod->contents.text.data = fs_get(Z_STRLEN_P(pvalue) + 1); + memcpy(bod->contents.text.data, Z_STRVAL_P(pvalue), Z_STRLEN_P(pvalue) + 1); + bod->contents.text.size = Z_STRLEN_P(pvalue); + } else { + bod->contents.text.data = fs_get(1); + memcpy(bod->contents.text.data, "", 1); + bod->contents.text.size = 0; + } } if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "lines", sizeof("lines") - 1)) != NULL) { bod->size.lines = zval_get_long(pvalue); @@ -3485,7 +3489,7 @@ PHP_FUNCTION(imap_mail_compose) bod=&part->body; - spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data, CRLF); + spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data ? (char *) bod->contents.text.data : "", CRLF); efree(mystring); mystring=tempstring; } while ((part = part->next)); /* until done */ diff --git a/ext/imap/tests/bug80242.phpt b/ext/imap/tests/bug80242.phpt new file mode 100644 index 0000000000..849e7c6212 --- /dev/null +++ b/ext/imap/tests/bug80242.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #80242 (imap_mail_compose() segfaults for multipart with rfc822) +--SKIPIF-- +<?php +if (!extension_loaded('imap')) die('skip imap extension not available'); +?> +--FILE-- +<?php +$bodies = [[ + 'type' => TYPEMULTIPART, +], [ + 'type' => TYPETEXT, + 'contents.data' => 'some text', +], [ + 'type' => TYPEMESSAGE, + 'subtype' => 'RFC822', +]]; +imap_mail_compose([], $bodies); +echo "done\n"; +?> +--EXPECT-- +done |