Skip to content

Fix imagetruecolortopalette() error message for $num_colors #24780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marc-mabe wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
Open

Fix imagetruecolortopalette() error message for $num_colors #24780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion ext/gd/tests/bug72697.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ext/gd/tests/imagetruecolortopalette_error3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions ext/gd/tests/imagetruecolortopalette_error4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading