sniper Thu Dec 30 00:31:56 2004 EDT Modified files: /php-src/ext/imap php_imap.c Log: - Fixed the crash and leak. http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.194&r2=1.195&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.194 php-src/ext/imap/php_imap.c:1.195 --- php-src/ext/imap/php_imap.c:1.194 Wed Dec 29 23:39:17 2004 +++ php-src/ext/imap/php_imap.c Thu Dec 30 00:31:55 2004 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.194 2004/12/30 04:39:17 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.195 2004/12/30 05:31:55 sniper Exp $ */ #define IMAP41 @@ -2980,7 +2980,7 @@ 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) { @@ -3194,9 +3194,7 @@ 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); } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php