cvs: php-src(PHP_5_2) /ext/gd gd.c /ext/spl spl_array.c

bjori Fri Nov 3 15:13:17 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c /php-src/ext/spl spl_array.c Log: MFH: Fix double "wrong param count" messages http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.8&r2=1.312.2.20.2.9&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.8 php-src/ext/gd/gd.c:1.312.2.20.2.9 --- php-src/ext/gd/gd.c:1.312.2.20.2.8 Wed Oct 18 16:04:37 2006 +++ php-src/ext/gd/gd.c Fri Nov 3 15:13:17 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.8 2006/10/18 16:04:37 bjori Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.9 2006/11/03 15:13:17 bjori Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -5057,8 +5057,10 @@ php_image_filter_smooth }; - if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 5 || zend_parse_parameters(2 TSRMLS_CC, "rl", &tmp, &filtertype) == FAILURE) { - ZEND_WRONG_PARAM_COUNT(); + if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 5) { + WRONG_PARAM_COUNT; + } else if (zend_parse_parameters(2 TSRMLS_CC, "rl", &tmp, &filtertype) == FAILURE) { + return; } if (filtertype >= 0 && filtertype <= IMAGE_FILTER_MAX) { http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.4&r2=1.71.2.17.2.5&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.4 php-src/ext/spl/spl_array.c:1.71.2.17.2.5 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.4 Fri Oct 20 02:11:19 2006 +++ php-src/ext/spl/spl_array.c Fri Nov 3 15:13:17 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.4 2006/10/20 02:11:19 pollita Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.5 2006/11/03 15:13:17 bjori Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1022,7 +1022,7 @@ zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern, 0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*)); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &array) == FAILURE) { - WRONG_PARAM_COUNT; + return; } if (Z_TYPE_PP(array) == IS_OBJECT && intern == (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) { zval_ptr_dtor(&intern->array);