Merge branch 'PHP-8.4'

php · Feb 5, 2025 · 65a20d5 · 65a20d5
2 parents dd66bb9 + dc7b661
commit 65a20d5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -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;

diff --git a/ext/gd/tests/gh17703.phpt b/ext/gd/tests/gh17703.phpt
@@ -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