From 10e87da1d6f9c1965a1bd787fcef9c5225b17035 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 21 Dec 2004 15:47:38 +0000 Subject: [PATCH] MFH: Fixed possible crash in imap_mail_compose(). --- ext/imap/php_imap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index f2b85e6951..aa4c9ba5d6 100644 --- 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); -- 2.40.0