mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.4'
This commit is contained in:
@@ -3956,6 +3956,11 @@ PHP_FUNCTION(imagescale)
|
||||
|
||||
im = php_gd_libgdimageptr_from_zval_p(IM);
|
||||
|
||||
if (tmp_h < 0 && tmp_w < 0) {
|
||||
zend_value_error("Argument #2 ($width) and argument #3 ($height) cannot be both negative");
|
||||
RETURN_THROWS();
|
||||
}
|
||||
|
||||
if (tmp_h < 0 || tmp_w < 0) {
|
||||
/* preserve ratio */
|
||||
long src_x, src_y;
|
||||
|
||||
17
ext/gd/tests/gh17703.phpt
Normal file
17
ext/gd/tests/gh17703.phpt
Normal file
@@ -0,0 +1,17 @@
|
||||
--TEST--
|
||||
GH-17703 both width and height value being negative triggers ValueError on width.
|
||||
--EXTENSIONS--
|
||||
gd
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$img = imagecreatetruecolor ( 256, 1);
|
||||
|
||||
try {
|
||||
imagescale($img, -1, -1, 0);
|
||||
} catch (\ValueError $e) {
|
||||
echo $e->getMessage();
|
||||
}
|
||||
?>
|
||||
--EXPECT--
|
||||
Argument #2 ($width) and argument #3 ($height) cannot be both negative
|
||||
Reference in New Issue
Block a user