mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source
This commit is contained in:
David Carlier 2024-10-06 11:01:57 +01:00
commit fde5e507f6
No known key found for this signature in database
GPG Key ID: 8486F847B4B94EF1
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -36,8 +36,10 @@ PHP NEWS
. Fixed bug GH-15168 (stack overflow in json_encode()). (nielsdos)
- GD:
. Fixed bug 16232 (bitshift overflow on wbmp file content reading /
. Fixed bug GH-16232 (bitshift overflow on wbmp file content reading /
fix backport from upstream). (David Carlier)
. Fixed bug GH-12264 (overflow/underflow on imagerotate degrees value)
(David Carlier)
- LDAP:
. Fixed bug GH-16032 (Various NULL pointer dereferencements in

5
ext/gd/gd.c
View File

@ -1194,6 +1194,11 @@ PHP_FUNCTION(imagerotate)
RETURN_THROWS();
}
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