Skip to content

ext/gd/imagefilter: Improve wording of ArgCount error #20158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2025
+11 −5
Merged

ext/gd/imagefilter: Improve wording of ArgCount error #20158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdcd5b0
ext/gd/imagefilter: Add test case for manual ZPP
Girgias Oct 12, 2025
0002622
ext/gd/imagefilter: Improve wording of ArgCount error
Girgias Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ,
Expand All @@ -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();
}

Expand Down
8 changes: 7 additions & 1 deletion ext/gd/tests/imagefilter_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ try {
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
var_dump(imagefilter(20, 1));
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
?>
--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