sniper Thu Dec 30 00:33:54 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/imap php_imap.c
Log:
MFH: Fixed crash + leak
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.34&r2=1.142.2.35&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.34
php-src/ext/imap/php_imap.c:1.142.2.35
--- php-src/ext/imap/php_imap.c:1.142.2.34 Wed Dec 29 23:38:40 2004
+++ php-src/ext/imap/php_imap.c Thu Dec 30 00:33:53 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.34 2004/12/30 04:38:40 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.35 2004/12/30 05:33:53 sniper Exp $ */
#define IMAP41
@@ -2951,7 +2951,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) {
@@ -3164,9 +3164,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
