Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 5a8958f0f323 · 2020-10-12T13:34:19.000+02:00
* PHP-7.4:
  Fix #80220: imap_mail_compose() may leak memory
diff --git a/NEWS b/NEWS
@@ -9,6 +9,7 @@ PHP                                                                        NEWS
 - IMAP:
   . Fixed bug #80213 (imap_mail_compose() segfaults on certain $bodies). (cmb)
   . Fixed bug #80215 (imap_mail_compose() may modify by-val parameters). (cmb)
+  . Fixed bug #80220 (imap_mail_compose() may leak memory). (cmb)
 
 - Opcache:
   . Fixed bug #80184 (Complex expression in while / if statements resolves to
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -3264,7 +3264,7 @@ PHP_FUNCTION(imap_mail_compose)`
`3264`	`3264`	`convert_to_string_ex(pvalue);`
`3265`	`3265`	`bod->md5 = cpystr(Z_STRVAL_P(pvalue));`
`3266`	`3266`	`}`
`3267`		`- } else if (Z_TYPE_P(data) == IS_ARRAY) {`
	`3267`	`+ } else if (Z_TYPE_P(data) == IS_ARRAY && topbod->type == TYPEMULTIPART) {`
`3268`	`3268`	`short type = -1;`
`3269`	`3269`	`SEPARATE_ARRAY(data);`
`3270`	`3270`	`if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "type", sizeof("type") - 1)) != NULL) {`