By-ref modification of typed and readonly props through ArrayIterator #10872
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
iluuu1994
commented
Mar 17, 2023
Girgias
approved these changes
Mar 17, 2023
arnaud-lb
reviewed
Mar 24, 2023
There was a problem hiding this comment.
spl_array_get_iterator has a by_ref parameter. We could store its value in the iterator, and use that in spl_array_it_get_current_data to find in a more direct way that the data is fetched as a ref.
FFI does something like that in zend_ffi_cdata_get_iterator / zend_ffi_cdata_it_get_current_data.
|
@arnaud-lb Oh, thank you, let me try that! |
|
That worked, thanks @arnaud-lb 🙂 |
TimWolla
reviewed
Mar 24, 2023
| spl_array_object *array_object = Z_SPLARRAY_P(object); | ||
|
|
||
| if (by_ref && (array_object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT)) { | ||
| zend_throw_error(NULL, "An iterator cannot be used with foreach by reference"); | ||
| return NULL; | ||
| } | ||
|
|
||
| iterator = emalloc(sizeof(zend_user_iterator)); | ||
| iterator = emalloc(sizeof(spl_array_iterator)); |
There was a problem hiding this comment.
Not sure what the style for PHP is, butin other projects the following is preferred:
Suggested change
| iterator = emalloc(sizeof(spl_array_iterator)); | |
| iterator = emalloc(sizeof(*iterator)); |
iluuu1994
commented
Mar 24, 2023
| if (array_iter->by_ref | ||
| && Z_TYPE_P(data) != IS_REFERENCE | ||
| && !(object->ar_flags & SPL_ARRAY_IS_SELF) | ||
| && !(object->ar_flags & SPL_ARRAY_USE_OTHER) |
There was a problem hiding this comment.
These two checks could be combined (although the compiler probably takes care of that)
arnaud-lb
approved these changes
Mar 25, 2023
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-10844