Fix GH-16053: array_merge_recursive(): convert_to_array() may need separation #16061
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
arnaud-lb
commented
Sep 25, 2024
| zend_throw_error(NULL, "Recursion detected"); | ||
| return 0; | ||
| } | ||
|
|
||
| ZEND_ASSERT(!Z_ISREF_P(dest_entry) || Z_REFCOUNT_P(dest_entry) > 1); | ||
| SEPARATE_ZVAL(dest_entry); |
There was a problem hiding this comment.
We can remove this one (move it after convert_to_array) because convert_to_array will change dest_entry itself, not its value.
This function needs some cleanup, as there are leftovers from previous refactorings. For instance I believe that src_entry == dest_entry above is always false, and we don't use the result of ZVAL_DEREF(dest_zval) because of dest_zval = dest_entry below. However this is out of scope of this bug fix.
bukka
approved these changes
Sep 28, 2024
arnaud-lb
added a commit
that referenced
this pull request
Oct 2, 2024
arnaud-lb
added a commit
that referenced
this pull request
Oct 2, 2024
* PHP-8.2: [ci skip] NEWS for GH-16061
arnaud-lb
added a commit
that referenced
this pull request
Oct 2, 2024
arnaud-lb
added a commit
that referenced
this pull request
Oct 2, 2024
arnaud-lb
added a commit
that referenced
this pull request
Oct 2, 2024
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 GH-16053