php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ext/gd/imagefilter: Improve wording of ArgCount error

Browse Source 
This is done by parsing this as 2 arguments with variadics that are never actually parsed
This commit is contained in:
Gina Peter Banyard
2025-10-13 00:34:18 +01:00
parent 0587da9ef1
commit 6cb21229f8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/gd/gd.c
View File

@@ -3605,7 +3605,7 @@ PHP_FUNCTION(imagefilter)
zval *tmp;
typedef void (*image_filter)(INTERNAL_FUNCTION_PARAMETERS);
zend_long filtertype;
zend_long filtertype = 0;
image_filter filters[] =
{
php_image_filter_negate ,
@@ -3623,9 +3623,9 @@ PHP_FUNCTION(imagefilter)
php_image_filter_scatter
};
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > IMAGE_FILTER_MAX_ARGS) {
WRONG_PARAM_COUNT;
} else if (zend_parse_parameters(2, "Ol", &tmp, gd_image_ce, &filtertype) == FAILURE) {
/* We need to do some initial ZPP parsing to be able to extract the filter value */
if (zend_parse_parameters(MIN(2, ZEND_NUM_ARGS()), "Ol*", &tmp, gd_image_ce, &filtertype) == FAILURE) {
RETURN_THROWS();
}

2
ext/gd/tests/imagefilter_error1.phpt
View File

@@ -21,5 +21,5 @@ try {
}
?>
--EXPECT--
Wrong parameter count for imagefilter()
imagefilter() expects at least 2 arguments, 1 given
imagefilter(): Argument #1 ($image) must be of type GdImage, int given