iliaa Mon Jun 16 13:42:04 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/imap php_imap.c Log: MFH: Fixed bug #24150 (crash in imap_fetch_overview() & imap_rfc822_write_address()) Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.142.2.15 php4/ext/imap/php_imap.c:1.142.2.16 --- php4/ext/imap/php_imap.c:1.142.2.15 Fri Jun 13 10:56:23 2003 +++ php4/ext/imap/php_imap.c Mon Jun 16 13:42:04 2003 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.142.2.15 2003/06/13 14:56:23 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.142.2.16 2003/06/16 17:42:04 iliaa Exp $ */ #define IMAP41 @@ -1955,6 +1955,10 @@ addr->error=NIL; addr->adl=NIL; + if (_php_imap_address_size(addr) >= MAILTMPLEN) { + RETURN_FALSE; + } + string[0]='\0'; rfc822_write_address(string, addr); RETVAL_STRING(string, 1); @@ -2715,13 +2719,13 @@ if (env->subject) { add_property_string(myoverview, "subject", env->subject, 1); } - if (env->from) { + if (env->from && _php_imap_address_size(env->from) >= MAILTMPLEN) { env->from->next=NULL; address[0] = '\0'; rfc822_write_address(address, env->from); add_property_string(myoverview, "from", address, 1); } - if (env->to) { + if (env->to && _php_imap_address_size(env->from) >= MAILTMPLEN) { env->to->next = NULL; address[0] = '\0'; rfc822_write_address(address, env->to);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php