diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 19:00:04 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 19:00:16 +0200 |
| commit | 4ef7be20abf565e902ae98490d1878aa384e2356 (patch) | |
| tree | da9a5b94f6a8ec71271f12a308ee67ee96d86f75 /ext/imap | |
| parent | a54f0f76801776d54df2eb28faabe6a6d51bd295 (diff) | |
| parent | 315b95b0654fca116d6db0f11dc22151ac139988 (diff) | |
| download | php-git-4ef7be20abf565e902ae98490d1878aa384e2356.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
Diffstat (limited to 'ext/imap')
| -rw-r--r-- | ext/imap/php_imap.c | 22 | ||||
| -rw-r--r-- | ext/imap/tests/bug80242.phpt | 22 |
2 files changed, 35 insertions, 9 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 9288b1efe9..c605866ef3 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3836,15 +3836,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); @@ -3945,7 +3949,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 |