From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 21 Dec 2004 15:47:27 +0000 (+0000)
Subject: MFH: Fixed possible crash in imap_mail_compose().
X-Git-Tag: php-5.0.4RC1~443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a5a70fe05646e11158c1f53287bdfd5a8e4e179;p=php

MFH: Fixed possible crash in imap_mail_compose().
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 8135ed435f..2f31995cc9 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2978,6 +2978,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);
@@ -3081,6 +3085,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);