MFH: Fixed possible crash in imap_mail_compose().

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index f2b85e69513ef805849e71ada673d5f6622fead2..aa4c9ba5d64547d29e910b9a5959d91b6dd29232 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2949,6 +2949,10 @@ PHP_FUNCTION(imap_mail_compose)
                        bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
                        memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
                        bod->contents.text.size = Z_STRLEN_PP(pvalue);
+               } else {
+                       bod->contents.text.data = (char *) fs_get(1);
+                       bod->contents.text.data = "";
+                       bod->contents.text.size = 0;
                }
                if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) {
                        convert_to_long_ex(pvalue);
@@ -3052,6 +3056,10 @@ PHP_FUNCTION(imap_mail_compose)
                                bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
                                memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1);
                                bod->contents.text.size = Z_STRLEN_PP(pvalue);
+                       } else {
+                               bod->contents.text.data = (char *) fs_get(1);
+                               bod->contents.text.data = "";
+                               bod->contents.text.size = 0;
                        }
                        if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) {
                                convert_to_long_ex(pvalue);