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

[Ilia Alshanetsky]

iliaa           Mon Feb  3 16:24:32 2003 EDT

  Modified files:              
    /php4/ext/imap      php_imap.c 
  Log:
  Fixed bug #22022 (Crash in imap_mail_compose() if the body is an empty array).
  
  
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.157 php4/ext/imap/php_imap.c:1.158
--- php4/ext/imap/php_imap.c:1.157      Wed Jan 29 21:33:14 2003
+++ php4/ext/imap/php_imap.c    Mon Feb  3 16:24:32 2003
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.157 2003/01/30 02:33:14 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.158 2003/02/03 21:24:32 iliaa Exp $ */
 
 #define IMAP41
 
@@ -2807,7 +2807,10 @@
        }
 
        zend_hash_internal_pointer_reset(Z_ARRVAL_PP(body));
-       zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data);
+       if (zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data) != SUCCESS) 
+{
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter cannot be 
+empty");
+               RETURN_FALSE;
+       }
        zend_hash_get_current_key(Z_ARRVAL_PP(body), &key, &ind, 0); /* FIXME: is this 
necessary?  we're not using key/ind */
 
        if (Z_TYPE_PP(data) == IS_ARRAY) {



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