Fix GH-17703: imagescale both width and heigh set with negative values. #17708
Conversation
ext/gd/gd.c
Outdated
| @@ -3633,6 +3633,11 @@ PHP_FUNCTION(imagescale) | |||
|
|
|||
| im = php_gd_libgdimageptr_from_zval_p(IM); | |||
|
|
|||
| if (tmp_h < 0 && tmp_w < 0) { | |||
| zend_value_error("$(width) and $(height) cannot be both negative"); | |||
There was a problem hiding this comment.
I don't think the parens make sense here:
| zend_value_error("$(width) and $(height) cannot be both negative"); | |
| zend_value_error("$width and $height cannot be both negative"); |
ext/gd/gd.c
Outdated
| @@ -3633,6 +3633,11 @@ PHP_FUNCTION(imagescale) | |||
|
|
|||
| im = php_gd_libgdimageptr_from_zval_p(IM); | |||
|
|
|||
| if (tmp_h < 0 && tmp_w < 0) { | |||
| zend_value_error("$width and $height cannot be both negative"); | |||
There was a problem hiding this comment.
We typically construct an argument_value_error-esque wording when doing these kinds of things.
Something like: Argument #2 ($width) and argument #3 ($height) cannot both be negative.
There was a problem hiding this comment.
Ok will change to return false here instead and will do a PR just for master, wdyt ?
There was a problem hiding this comment.
I think the patch as it's now doesn't change anything (well, we bail out a bit earlier), since previously the function also returned false if both width and height have been negative. I suggest to apply the previous patch to PHP-8.4+ (the ValueError was already there previously, only the error message changes). Only applying that to master is fine for me, too.
…lues. Throwing a ValueError in this particular case.
devnexen
requested review from
kocsismate,
dstogov,
arnaud-lb,
alexdowad,
youkidearitai,
bukka,
Girgias,
derickr,
adoy,
SakiTakamachi and
TimWolla
as code owners
devnexen
removed request for
adoy,
bukka,
derickr,
TimWolla,
youkidearitai,
arnaud-lb,
alexdowad,
dstogov,
kocsismate and
Girgias
Throwing a ValueError in this particular case.