Fix #78620: Out of memory error #4766
Closed
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
If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the macro evaluates to `0`, what we should catch early.
nikic
reviewed
Oct 2, 2019
We also add a comment.
nikic
approved these changes
Oct 2, 2019
|
Thanks! Applied as 8ce04df. |
nikic
reviewed
Oct 2, 2019
| if (UNEXPECTED(new_size == 0)) { | ||
| /* overflow in ZEND_MM_ALIGNED_SIZE_EX */ | ||
| goto memory_limit_exhausted; | ||
| } |
There was a problem hiding this comment.
On second thought, this fix doesn't look quite right ... especially the fact that this is in the #if ZEND_MM_LIMIT branch, while this check is necessary even without memory limit. I think it would be better to move this check outside of #if ZEND_MM_LIMIT and generate a "Possible integer overflow in memory allocation (%zu + %zu)" style error for that case.
There was a problem hiding this comment.
Okay, reverted for now (f2fb37a). Will come up with a better solution ASAP.
php-pulls
pushed a commit
that referenced
this pull request
Oct 2, 2019
This reverts commit 8ce04df. Cf. <#4766 (comment)>.
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.
If the integer addition in
ZEND_MM_ALIGNED_SIZE_EXoverflows, themacro evaluates to
0, what we should catch early.There are many more uses of
ZEND__MM_ALIGNED_SIZE_EX; not sure if overflow can happen there as well.