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.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20551: imagegammacorrect out of range gamma value.
This commit is contained in:
David Carlier
2025-11-22 22:23:41 +00:00
parent e2219488ba 30cb1998ae
commit 4d71d8a454
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/gd/gd.c
View File

@@ -2453,11 +2453,21 @@ PHP_FUNCTION(imagegammacorrect)
RETURN_THROWS();
}
if (!zend_finite(input)) {
zend_argument_value_error(2, "must be finite");
RETURN_THROWS();
}
if (output <= 0.0) {
zend_argument_value_error(3, "must be greater than 0");
RETURN_THROWS();
}
if (!zend_finite(output)) {
zend_argument_value_error(3, "must be finite");
RETURN_THROWS();
}
gamma = input / output;
im = php_gd_libgdimageptr_from_zval_p(IM);

36
ext/gd/tests/gh20551.phpt Normal file
View File

@@ -0,0 +1,36 @@
--TEST--
GH-20551: (imagegammacorrect out of range input/output value)
--EXTENSIONS--
gd
--FILE--
<?php
$im = imagecreate(64, 32);
$gammas = [
[NAN, 1.0],
[-NAN, 1.0],
[INF, 1.0],
[-INF, 1.0],
[1.0, NAN],
[1.0, -NAN],
[1.0, INF],
[1.0, -INF],
];
foreach ($gammas as $gamma) {
try {
imagegammacorrect($im, $gamma[0], $gamma[1]);
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
}
?>
--EXPECT--
imagegammacorrect(): Argument #2 ($input_gamma) must be finite
imagegammacorrect(): Argument #2 ($input_gamma) must be finite
imagegammacorrect(): Argument #2 ($input_gamma) must be finite
imagegammacorrect(): Argument #2 ($input_gamma) must be greater than 0
imagegammacorrect(): Argument #3 ($output_gamma) must be finite
imagegammacorrect(): Argument #3 ($output_gamma) must be finite
imagegammacorrect(): Argument #3 ($output_gamma) must be finite
imagegammacorrect(): Argument #3 ($output_gamma) must be greater than 0