cvs: php-src(PHP_4_3) / NEWS /ext/imap php_imap.c

iliaa Tue Jan 18 11:34:04 2005 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/imap php_imap.c Log: MFH: Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.807&r2=1.1247.2.808&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.807 php-src/NEWS:1.1247.2.808 --- php-src/NEWS:1.1247.2.807 Tue Jan 18 10:51:23 2005 +++ php-src/NEWS Tue Jan 18 11:34:03 2005 @@ -4,6 +4,7 @@ - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Fixed bug #31580 (fgetcsv() problematic with "" escape sequences). (Ilia) +- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia) - Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen). (Ilia) - Fixed bug #31454 (session_set_save_handler crashes PHP when supplied non-existent object ref). (Tony) http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.36&r2=1.142.2.37&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.142.2.36 php-src/ext/imap/php_imap.c:1.142.2.37 --- php-src/ext/imap/php_imap.c:1.142.2.36 Mon Jan 10 23:56:57 2005 +++ php-src/ext/imap/php_imap.c Tue Jan 18 11:34:04 2005 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.142.2.36 2005/01/11 04:56:57 sniper Exp $ */ +/* $Id: php_imap.c,v 1.142.2.37 2005/01/18 16:34:04 iliaa Exp $ */ #define IMAP41 @@ -3060,7 +3060,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) { @@ -3075,9 +3075,8 @@ convert_to_string_ex(pvalue); bod->md5 = cpystr(Z_STRVAL_PP(pvalue)); } - - zend_hash_move_forward(Z_ARRVAL_PP(body)); } + zend_hash_move_forward(Z_ARRVAL_PP(body)); } rfc822_encode_body_7bit(env, topbod);