Fix GH-20620: bzcompress() overflow on large source size. #20621
+26
−1
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
ndossche
requested changes
Dec 4, 2025
| --EXTENSIONS-- | ||
| bz2 | ||
| --SKIPIF-- | ||
| <?php if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only'); ?> |
Member
There was a problem hiding this comment.
You should also add the "slow test" environment variable skipif in my opinion, so that CI won't blow up.
Comment on lines
+458
to
+460
| double chunk_len = (double)source_len * 1.01 + 600.0; | ||
|
|
||
| if (source_len > UINT_MAX || chunk_len > UINT_MAX) { |
Member
There was a problem hiding this comment.
I think it's better to do this with unsigned integer math (untested, but should be something like this)
The first check (chunk_len < source_len) checks whether we got an overflow.
The second check is necessary to not go beyond either the 32-bit limit or the string length limit.
Suggested change
| double chunk_len = (double)source_len * 1.01 + 600.0; | |
| if (source_len > UINT_MAX || chunk_len > UINT_MAX) { | |
| size_t chunk_len = source_len + source_len / 100 + 600; | |
| if (chunk_len < source_len || chunk_len > MIN(UINT_MAX, ZSTR_MAX_LEN)) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
No description provided.