diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-11-03 15:13:17 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-11-03 15:13:17 +0000 |
| commit | 5006fb2cebdaf593d575e53bbf03551ae110489b (patch) | |
| tree | 67bff0152aebf18767460ef89cb95f57e702885c /ext | |
| parent | 91c604d584e858bba4fadc2ad0d53ccb3e206191 (diff) | |
| download | php-git-5006fb2cebdaf593d575e53bbf03551ae110489b.tar.gz | |
MFH: Fix double "wrong param count" messages
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/gd.c | 6 | ||||
| -rwxr-xr-x | ext/spl/spl_array.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 3c74c9c151..a6f3c9825f 100644 --- 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 76af597da0..c7904f0332 100755 --- 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); |