ext/gd: checking imagescale/imagefilter invalid values. #14598
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
reviewed
Jul 7, 2024
ext/gd/gd.c
Outdated
Comment on lines
3648
to
3656
| if (ZEND_SIZE_T_INT_OVFL(scatter_sub)) { | ||
| zend_argument_value_error(3, "must not be greater than %d", INT_MAX); | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if (ZEND_SIZE_T_INT_OVFL(scatter_plus)) { | ||
| zend_argument_value_error(4, "must not be greater than %d", INT_MAX); | ||
| RETURN_THROWS(); | ||
| } |
There was a problem hiding this comment.
Does this also handle negative underflows? Or do the scatter arguments need to be greater than 0?
devnexen
force-pushed
the
gd_more_of_checks
branch
from
3d014f5
to
2e01b30
Compare
Girgias
reviewed
Jul 7, 2024
Comment on lines
+3648
to
+3656
| if (scatter_sub < 0 || ZEND_SIZE_T_INT_OVFL(scatter_sub)) { | ||
| zend_argument_value_error(3, "must be between 0 and %d", INT_MAX); | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if (scatter_plus < 0 || ZEND_SIZE_T_INT_OVFL(scatter_plus)) { | ||
| zend_argument_value_error(4, "must be between 0 and %d", INT_MAX); | ||
| RETURN_THROWS(); | ||
| } |
There was a problem hiding this comment.
Could you add a test hitting those?
devnexen
force-pushed
the
gd_more_of_checks
branch
3 times, most recently
from
9f9ddfd
to
639256b
Compare
devnexen
force-pushed
the
gd_more_of_checks
branch
from
639256b
to
ffcf8c3
Compare
Girgias
approved these changes
Jul 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.