diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-12 13:34:42 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-12 13:34:42 +0200 |
| commit | c3365bb301fd0a0cb6b5e3b6df5f6742d4262dca (patch) | |
| tree | f6374aa9a4cb07f8f7f1dca5e9a36ced893325e2 /ext/imap/php_imap.c | |
| parent | e735de6eae4a60fb55fac6fc99b6b63f525c4b4b (diff) | |
| parent | 5a8958f0f32374e97c18ffa0f11b3e1aac8a7811 (diff) | |
| download | php-git-c3365bb301fd0a0cb6b5e3b6df5f6742d4262dca.tar.gz | |
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Fix #80220: imap_mail_compose() may leak memory
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 4c2d7dd772..26947f9e79 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3264,7 +3264,7 @@ PHP_FUNCTION(imap_mail_compose) convert_to_string_ex(pvalue); bod->md5 = cpystr(Z_STRVAL_P(pvalue)); } - } else if (Z_TYPE_P(data) == IS_ARRAY) { + } else if (Z_TYPE_P(data) == IS_ARRAY && topbod->type == TYPEMULTIPART) { short type = -1; SEPARATE_ARRAY(data); if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "type", sizeof("type") - 1)) != NULL) { |