Browse Source

MFH: Fix double "wrong param count" messages

experimental/5.2-WITH_DRCP
Hannes Magnusson 20 years ago
parent
commit
5006fb2ceb
  1. 6
      ext/gd/gd.c
  2. 2
      ext/spl/spl_array.c

6
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) {

2
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);

Loading…
Cancel
Save