Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays #10970
Conversation
This file contains 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
…mutable arrays The ZVAL_ARR macro always set the zval type_info to IS_ARRAY_EX, even if the hash table is immutable. Since in preg_replace_callback_array() we can return the passed array directly, and that passed array can be immutable, we need to reset the type_flags to keep the VM from performing ref-counting on the array. Fixes phpGH-10968
Girgias
reviewed
Mar 29, 2023
| @@ -2479,7 +2479,11 @@ PHP_FUNCTION(preg_replace_callback_array) | |||
| } | |||
|
|
|||
| if (subject_ht) { | |||
| RETURN_ARR(subject_ht); | |||
| RETVAL_ARR(subject_ht); | |||
| if (GC_FLAGS(subject_ht) & GC_IMMUTABLE) { | |||
There was a problem hiding this comment.
Suggested change
| if (GC_FLAGS(subject_ht) & GC_IMMUTABLE) { | |
| if (GC_FLAGS(subject_ht) & IS_ARRAY_IMMUTABLE) { |
Maybe?
There was a problem hiding this comment.
Right, I forgot we have an alias. Thanks!
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.
The ZVAL_ARR macro always set the zval type_info to IS_ARRAY_EX, even if the hash table is immutable. Since in preg_replace_callback_array() we can return the passed array directly, and that passed array can be immutable, we need to reset the type_flags to keep the VM from performing ref-counting on the array.
Fixes GH-10968
We could also introduce a new macro for this but I couldn't find another place that potentially returns an immutable array.