cvs: php-src /ext/imap php_imap.c

iliaa Tue Apr 8 00:02:01 2008 UTC Modified files: /php-src/ext/imap php_imap.c Log: MFB: 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.248&r2=1.249&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.248 php-src/ext/imap/php_imap.c:1.249 --- php-src/ext/imap/php_imap.c:1.248 Wed Apr 2 16:29:08 2008 +++ php-src/ext/imap/php_imap.c Tue Apr 8 00:02:01 2008 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.248 2008/04/02 16:29:08 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.249 2008/04/08 00:02:01 iliaa Exp $ */ #define IMAP41 @@ -3046,8 +3046,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; }