Don't call __set() on uninitialized typed properties (Z_EXTRA variant) #4856
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
dstogov
approved these changes
Oct 24, 2019
Zend/zend_API.c
Outdated
| @@ -1264,12 +1264,14 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend | |||
| if (UNEXPECTED(class_type->type == ZEND_INTERNAL_CLASS)) { | |||
| do { | |||
| ZVAL_COPY_OR_DUP(dst, src); | |||
| Z_EXTRA_P(dst) = Z_EXTRA_P(src); | |||
There was a problem hiding this comment.
Better to introduce special macros instead of generic Z_EXTRA_P(), to easily find all relevant usages.
| @@ -270,7 +270,7 @@ static void zend_class_copy_ctor(zend_class_entry **pce) | |||
| end = src + ce->default_properties_count; | |||
| ce->default_properties_table = dst; | |||
| for (; src != end; src++, dst++) { | |||
| ZVAL_COPY_VALUE(dst, src); | |||
| *dst = *src; | |||
Zend/zend_inheritance.c
Outdated
| @@ -1158,7 +1158,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par | |||
| do { | |||
| dst--; | |||
| src--; | |||
| ZVAL_COPY_VALUE(dst, src); | |||
| *dst = *src; /* Copy Z_EXTRA as well */ | |||
There was a problem hiding this comment.
Here and later: better to keep the existing code under #if 0 with comments about optimization (or introduce special macro ZVAL_COPY_PROP_VALUE)
Also don't set it for static properties -- this is only relevant for instance properties, as static properties have no __set().
nikic
force-pushed
the
uninit-prop-magic-set-2
branch
from
64faaec to
68b54e7
Compare
|
Merged as f1848a4. |
|
Ad:
I suppose this is just another case that could be solved by having property accessors. |
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.
Same as #4854 but based on Z_EXTRA rather than TYPE_FLAG.