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

[Antony Dovgal]

tony2001                Tue Jan 25 09:20:03 2005 EDT

  Modified files:              
    /php-src/ext/imap   php_imap.c 
  Log:
  check body for NULL before using and prevent segfaults
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.202&r2=1.203&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.202 php-src/ext/imap/php_imap.c:1.203
--- php-src/ext/imap/php_imap.c:1.202   Fri Jan 21 05:55:41 2005
+++ php-src/ext/imap/php_imap.c Tue Jan 25 09:20:02 2005
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.202 2005/01/21 10:55:41 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.203 2005/01/25 14:20:02 tony2001 Exp $ */
 
 #define IMAP41
 
@@ -2653,6 +2653,10 @@
        object_init(return_value);
        
        body=mail_body(imap_le_struct->imap_stream, Z_LVAL_PP(msg), 
Z_STRVAL_PP(section));
+       if (body == NULL) {
+               zval_dtor(return_value);
+               RETURN_FALSE;
+       }
        if (body->type <= TYPEMAX) {
                add_property_long(return_value, "type", body->type);
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php