Handle concurrent mutations during reference assignment #20254
+513
−42
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.
Typed references may be modified while assigning to them, during coercion:
Here we fix these issues.
Freeing is avoided by increasing the refcount during assignment.
Source list issues are fixed by updating the iteration code, and modifying the list in append-only mode during assignment.
zend_verify_ref_assignable_zval()
repeats coercion for every type source, to ensure consistency. Since each execution of a__toString()
may append new types, this could easily result in an infinite loop. To avoid this, we execute__toString()
only once, assuming that converting the same object to string twice will have the same result.Fixes: #15961 (comment) / #15961 (comment).
TODO: more tests