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'

Browse Source
This commit is contained in:
David Carlier
2024-10-06 11:02:43 +01:00
parent 39ae00fa0a 3caa5f8592
commit 1feb210e93
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/gd/gd.c
View File

@@ -1237,6 +1237,11 @@ PHP_FUNCTION(imagerotate)
Z_PARAM_LONG(color)
ZEND_PARSE_PARAMETERS_END();
if (degrees < (double)(INT_MIN / 100) || degrees > (double)(INT_MAX / 100)) {
zend_argument_value_error(2, "must be between %d and %d", (INT_MIN / 100), (INT_MAX / 100));
RETURN_THROWS();
}
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);

22
ext/gd/tests/gh16260.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
GH-16260 (Overflow/underflow on imagerotate degrees argument)
--EXTENSIONS--
gd
--FILE--
<?php
$im = imagecreatetruecolor(10,10);
try {
imagerotate($im, PHP_INT_MIN, 0);
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
try {
imagerotate($im, PHP_INT_MAX, 0);
} catch (\ValueError $e) {
echo $e->getMessage();
}
--EXPECTF--
imagerotate(): Argument #2 ($angle) must be between %s and %s
imagerotate(): Argument #2 ($angle) must be between %s and %s