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

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix GH-20070: Return type violation in imagefilter when an invalid filter is provided
This commit is contained in:
Gina Peter Banyard
2025-10-12 23:10:42 +01:00
parent 83ee6d34e4 c1d0c61e81
commit 7ec9420db8
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/gd/gd.c
View File

@@ -3629,9 +3629,11 @@ PHP_FUNCTION(imagefilter)
RETURN_THROWS();
}
if (filtertype >= 0 && filtertype <= IMAGE_FILTER_MAX) {
filters[filtertype](INTERNAL_FUNCTION_PARAM_PASSTHRU);
if (UNEXPECTED(filtertype < 0 || filtertype > IMAGE_FILTER_MAX)) {
zend_argument_value_error(2, "must be one of the IMG_FILTER_* filter constants");
RETURN_THROWS();
}
filters[filtertype](INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
/* }}} */

16
ext/gd/tests/imagefilter_invalid_filter_error.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
GH-20070: Testing wrong parameter passing in imagefilter() of GD library
--EXTENSIONS--
gd
--FILE--
<?php
$image = imagecreatetruecolor(1, 1);
try {
var_dump(imagefilter($image, -1));
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
ValueError: imagefilter(): Argument #2 ($filter) must be one of the IMG_FILTER_* filter constants