Fix handling of references in nested data #4497
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
|
The issue is that nested data removal stops at any node that is not part of the root buffer. Because references aren't added to it, we always stop at references and may miss nested data that way. |
dstogov
reviewed
Aug 8, 2019
| @@ -71,6 +71,7 @@ static void ZEND_FASTCALL zend_string_destroy(zend_string *str) | |||
| static void ZEND_FASTCALL zend_reference_destroy(zend_reference *ref) | |||
| { | |||
| ZEND_ASSERT(!ZEND_REF_HAS_TYPE_SOURCES(ref)); | |||
| GC_REMOVE_FROM_BUFFER(ref); | |||
| i_zval_ptr_dtor(&ref->val); | |||
| efree_size(ref, sizeof(zend_reference)); | |||
There was a problem hiding this comment.
There are some other places where the zend_reference may be deallocated (e.g. zend_assign_to_variable)
There was a problem hiding this comment.
I'm wondering whether we actually need to handle other places: We are only adding resources to the root buffer during garbage collection here, not before. So references with a root buffer entry shouldn't be visible from normal code.
|
Fixed by 9b43e29 instead. |
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.
This addresses the issue from #4489 (comment).