MFH: Fix double "wrong param count" messages

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 3c74c9c15191ead6a3bb401924e997d3af5f1917..a6f3c9825f4f0ecc572be874e9fbbee0bd25281c 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5057,8 +5057,10 @@ PHP_FUNCTION(imagefilter)
                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) {

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 76af597da0af458441ef397a05a0bb4c107d7594..c7904f0332c27696bd00b0db3424f7d871184c45 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1022,7 +1022,7 @@ SPL_METHOD(Array, exchangeArray)
        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);