diff --git a/NEWS b/NEWS index 131c02d4c240..b9cef48696be 100644 --- a/NEWS +++ b/NEWS @@ -80,6 +80,9 @@ PHP NEWS - FTP: . Fix double free in ext/ftp data_accept() on accept failure. (alepacheco) +- GD: + . Fixed imagetruecolortopalette() error message. (Marc Bennewitz) + - Hash: . Fix GOST and Snefru digests of 512 MiB or more. (Martin Mirchev) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 92001c4f9967..21fb90c3b4d1 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -729,7 +729,7 @@ PHP_FUNCTION(imagetruecolortopalette) im = php_gd_libgdimageptr_from_zval_p(IM); if (ncolors <= 0 || ZEND_LONG_INT_OVFL(ncolors)) { - zend_argument_value_error(3, "must be greater than 0 and less than %d", INT_MAX); + zend_argument_value_error(3, "must be between 1 and %d", INT_MAX); RETURN_THROWS(); } diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt index a7ab6114db34..f8c21406ba05 100644 --- a/ext/gd/tests/bug72697.phpt +++ b/ext/gd/tests/bug72697.phpt @@ -20,5 +20,5 @@ trycatch_dump( ?> DONE --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 DONE diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt index 0cbeca7e6d8b..d7726562572c 100644 --- a/ext/gd/tests/imagetruecolortopalette_error3.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt @@ -20,4 +20,4 @@ trycatch_dump( ?> --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt index d1e8cffc39d3..36b6d91b854b 100644 --- a/ext/gd/tests/imagetruecolortopalette_error4.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt @@ -21,5 +21,5 @@ trycatch_dump( ?> --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647