[PHP-CVS] cvs: php4 /ext/imap php_imap.c

[Ilia Alshanetsky]

iliaa           Mon Jun 16 13:41:52 2003 EDT

  Modified files:              
    /php4/ext/imap      php_imap.c 
  Log:
  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.170 php4/ext/imap/php_imap.c:1.171
--- php4/ext/imap/php_imap.c:1.170      Mon Jun 16 09:39:56 2003
+++ php4/ext/imap/php_imap.c    Mon Jun 16 13:41:52 2003
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.170 2003/06/16 13:39:56 andrey Exp $ */
+/* $Id: php_imap.c,v 1.171 2003/06/16 17:41:52 iliaa Exp $ */
 
 #define IMAP41
 
@@ -1997,6 +1997,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);
@@ -2745,13 +2749,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