ext/standard/image.c: Fix unsafe integer conversion #18661
+10
−0
Conversation
This file contains hidden or 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
andr3y-k0v4l3v
force-pushed
the
fix-unsafe-conversion-ext-standard-image
branch
2 times, most recently
from
2295fa9 to
0b1fae9
Compare
Comment on lines
+1524
to
+1530
| if (result && | ||
| result->width <= INT32_MAX && | ||
| result->height <= INT32_MAX && | ||
| result->bits <= INT32_MAX && | ||
| result->channels <= INT32_MAX) | ||
| { |
There was a problem hiding this comment.
You can check whether it's a 32-bit build and use conditional compilation accordingly.
Suggested change
| if (result && | |
| result->width <= INT32_MAX && | |
| result->height <= INT32_MAX && | |
| result->bits <= INT32_MAX && | |
| result->channels <= INT32_MAX) | |
| { | |
| #if SIZEOF_ZEND_LONG == 4 | |
| if (result && | |
| result->width <= INT32_MAX && | |
| result->height <= INT32_MAX && | |
| result->bits <= INT32_MAX && | |
| result->channels <= INT32_MAX) | |
| { | |
| #else | |
| if (result) { | |
| #endif |
- Add checks for image dimensions (width/height/bits/channels) against INT32_MAX. - Prevent sign-bit override when converting unsigned int to zend_long on 32-bit platforms. - Ensure consistent behavior across architectures for getimagesize() results. Reported-by: Dmitriy Fedin <[email protected]> Signed-off-by: Andrey Kovalev <[email protected]>
andr3y-k0v4l3v
force-pushed
the
fix-unsafe-conversion-ext-standard-image
branch
from
0b1fae9 to
3f92617
Compare
|
Why not just update the format string? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Reported-by: Dmitriy Fedin [email protected]