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

iliaa Tue Apr 8 00:01:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/imap php_imap.c Log: Fixed bug #44663 (Crash in imap_mail_compose if "body" parameter invalid) http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.8&r2=1.208.2.7.2.26.2.9&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.8 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.9 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.8 Wed Apr 2 16:26:39 2008 +++ php-src/ext/imap/php_imap.c Tue Apr 8 00:01:48 2008 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.8 2008/04/02 16:26:39 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.9 2008/04/08 00:01:48 iliaa Exp $ */ #define IMAP41 @@ -3047,8 +3047,8 @@ } zend_hash_internal_pointer_reset(Z_ARRVAL_PP(body)); - 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"); + if (zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data) != SUCCESS || Z_TYPE_PP(data) != IS_ARRAY) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter must be a non-empty array"); RETURN_FALSE; }