From: foobar Date: Thu, 30 Dec 2004 05:33:26 +0000 (+0000) Subject: MFH: Fixed crash + leak X-Git-Tag: php-5.0.4RC1~409 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=853f2aaf0c8d97fd2c62aca11cd5645e0305311d;p=php MFH: Fixed crash + leak --- diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index bfc557ebfa..9d7958ebba 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -2980,7 +2980,7 @@ PHP_FUNCTION(imap_mail_compose) bod->contents.text.size = Z_STRLEN_PP(pvalue); } else { bod->contents.text.data = (char *) fs_get(1); - bod->contents.text.data = ""; + memcpy(bod->contents.text.data, "", 1); bod->contents.text.size = 0; } if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) { @@ -3193,9 +3193,7 @@ PHP_FUNCTION(imap_mail_compose) RETVAL_STRING(tempstring, 0); done: -#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately this seems to cause a crash in some cases */ mail_free_body(&topbod); -#endif mail_free_envelope(&env); } /* }}} */