Fix GH-16322: imageaffine overflow on affine argument. #16334
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
cmb69
added a commit
that referenced
this pull request
Oct 9, 2024
devnexen
force-pushed
the
gh16322
branch
2 times, most recently
from
bc91602
to
2a070dc
Compare
cmb69
reviewed
Oct 10, 2024
ext/gd/gd.c
Outdated
| break; | ||
| case IS_DOUBLE: | ||
| affine[i] = Z_DVAL_P(zval_affine_elem); | ||
| if (ZEND_LONG_EXCEEDS_INT(affine[i])) { |
There was a problem hiding this comment.
I don't think this will work on 32bit platforms, since ZEND_LONG_EXCEEDS_INT() is a no-op there, but users can pass a matrix like [9223372036854775807., 1, 1, 1, 1, 1]. Same for the IS_STRING case below.
There was a problem hiding this comment.
you re right I always forget.
cmb69
approved these changes
Oct 11, 2024
| @@ -3687,13 +3687,25 @@ PHP_FUNCTION(imageaffine) | |||
| if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) { | |||
| switch (Z_TYPE_P(zval_affine_elem)) { | |||
| case IS_LONG: | |||
| affine[i] = Z_LVAL_P(zval_affine_elem); | |||
| affine[i] = Z_LVAL_P(zval_affine_elem); | |||
| if (affine[i] < INT_MIN || affine[i] > INT_MAX) { | |||
There was a problem hiding this comment.
This guard could use ZEND_LONG_EXCEEDS_INT(), but for consistency it maybe better this way (and the compiler will optimize away anyway).
ext/gd/tests/gh16322.phpt
Outdated
| --INI-- | ||
| memory_limit=-1 | ||
| --SKIPIF-- | ||
| <?php if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only'); ?> |
There was a problem hiding this comment.
The test could make sense on 32bit platforms, too, if instead of PHP_INT_MIN and PHP_INT_MAX doubles would be used.
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.