Commit 65a20d5

committed

Merge branch 'PHP-8.4'

2 parents dd66bb9 + dc7b661 commit 65a20d5Copy full SHA for 65a20d5

File tree

+22

-0

lines changed

+22

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3956,6 +3956,11 @@ PHP_FUNCTION(imagescale)`
`3956`	`3956`
`3957`	`3957`	`im = php_gd_libgdimageptr_from_zval_p(IM);`
`3958`	`3958`
	`3959`	`+ if (tmp_h < 0 && tmp_w < 0) {`
	`3960`	`+ zend_value_error("Argument #2 ($width) and argument #3 ($height) cannot be both negative");`
	`3961`	`+ RETURN_THROWS();`
	`3962`	`+ }`
	`3963`	`+`
`3959`	`3964`	`if (tmp_h < 0 \|\| tmp_w < 0) {`
`3960`	`3965`	`/* preserve ratio */`
`3961`	`3966`	`long src_x, src_y;`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,17 @@`
	`1`	`+--TEST--`
	`2`	`+GH-17703 both width and height value being negative triggers ValueError on width.`
	`3`	`+--EXTENSIONS--`
	`4`	`+gd`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+`
	`8`	`+$img = imagecreatetruecolor ( 256, 1);`
	`9`	`+`
	`10`	`+try {`
	`11`	`+ imagescale($img, -1, -1, 0);`
	`12`	`+} catch (\ValueError $e) {`
	`13`	`+ echo $e->getMessage();`
	`14`	`+}`
	`15`	`+?>`
	`16`	`+--EXPECT--`
	`17`	`+Argument #2 ($width) and argument #3 ($height) cannot be both negative`

Comments

(0)