Repository navigation
Fix GH-23089: stack overflow in array_merge_recursive() - #25406
Open
akasakariko wants to merge 1 commit into
Open
akasakariko wants to merge 1 commit into
akasakariko wants to merge 1 commit into
Conversation
Check the Zend stack limit before descending into nested arrays Add a regression test with iterative input cleanup to isolate the merge failure from the separate array destruction overflow under AddressSanitizer Continues the stack guard proposed in phpGH-23091
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
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.
Fixes #23089
Check the Zend stack limit in
array_merge_recursive()so deeply nested merges throw anErrorbefore exhausting the native stack, using the same guard asarray_replace_recursive()Continues #23091, which was closed without merging; the object cleanup raised in that review is already present through #23340
The original input still encounters the independent array destruction overflow in #15869 during shutdown after reporting the Error, which also reproduces with the merge call removed
The regression frees its input iteratively to isolate recursive merging and runs under AddressSanitizer
Validation on macOS arm64
stack_limit_002andstack_limit_004Fiber failures reproduced on the unmodified baseline