diff --git a/ext/gd/gd.c b/ext/gd/gd.c index ef5bc9a03a342..3b824430597b6 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1195,6 +1195,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); diff --git a/ext/gd/tests/gh16260.phpt b/ext/gd/tests/gh16260.phpt new file mode 100644 index 0000000000000..563fc8d162786 --- /dev/null +++ b/ext/gd/tests/gh16260.phpt @@ -0,0 +1,22 @@ +--TEST-- +GH-16260 (Overflow/underflow on imagerotate degrees argument) +--EXTENSIONS-- +gd +--FILE-- +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