Fix bug #81163 indirect vars in __sleep #7169
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
nikic
reviewed
Jun 18, 2021
krakjoe
force-pushed
the
bug81163
branch
3 times, most recently
from
d601160 to
393624e
Compare
nikic
reviewed
Jun 18, 2021
ext/standard/var.c
Outdated
| @@ -980,7 +980,13 @@ static void php_var_serialize_nested_data(smart_str *buf, zval *struc, HashTable | |||
| static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_ptr, php_serialize_data_t var_hash) /* {{{ */ | |||
| { | |||
| HashTable props; | |||
| if (php_var_serialize_get_sleep_props(&props, struc, HASH_OF(retval_ptr)) == SUCCESS) { | |||
|
|
|||
| if (Z_TYPE_P(retval_ptr) != IS_ARRAY) { | |||
There was a problem hiding this comment.
This check should be in php_var_serialize_call_sleep, replacing the HASH_OF check there.
There was a problem hiding this comment.
Right, of course.
Also, we want to do the other kind of fix (correctly) in branches below master, right ?
nikic
approved these changes
Jun 18, 2021
In 696d9d6 Quick sanity check ? |
nikic
approved these changes
Jun 18, 2021
|
Merged as fba4391 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.
No description provided.