Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 1257731b246cbf47db10c714c813ee7f52277a9e..7e6fa12b5eed5adf852d8cc8aa19a0d289e17080 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3045,7 +3045,8 @@ PHP_FUNCTION(imap_mail_compose)
                        if (zend_hash_find(Z_ARRVAL_PP(data), "charset", sizeof("charset"), (void **) &pvalue)== SUCCESS) {
                                convert_to_string_ex(pvalue);
                                tmp_param = mail_newbody_parameter();
-                               tmp_param->value = cpystr(Z_STRVAL_PP(pvalue));
+                               tmp_param->value = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+                               memcpy(disp_param->value, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1);
                                tmp_param->attribute = "CHARSET";
                                tmp_param->next = bod->parameter;
                                bod->parameter = tmp_param;