archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-02-05 19:41:16 +00:00
commit 65a20d5a09
No known key found for this signature in database
GPG key ID: 2FB76A8CE6CD2B41
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/gd/gd.c
View file

@ -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
View 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