archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ws

Browse source
This commit is contained in:
Dmitry Stogov 2018-01-22 13:37:48 +03:00
parent 9cbb521094
commit c75346dcb5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/standard/var_unserializer.c
View file

@ -440,7 +440,7 @@ string_key:
&& zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) { && zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) {
zend_property_info *existing_propinfo; zend_property_info *existing_propinfo;
zend_string *new_key; zend_string *new_key;
const char *unmangled_class = NULL; const char *unmangled_class = NULL;
const char *unmangled_prop; const char *unmangled_prop;
size_t unmangled_prop_len; size_t unmangled_prop_len;
zend_string *unmangled; zend_string *unmangled;
@ -453,7 +453,7 @@ string_key:
unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0); unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0);
existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled); existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled);
if ((existing_propinfo != NULL) if ((existing_propinfo != NULL)
&& (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) { && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) {
if (existing_propinfo->flags & ZEND_ACC_PROTECTED) { if (existing_propinfo->flags & ZEND_ACC_PROTECTED) {
new_key = zend_mangle_property_name( new_key = zend_mangle_property_name(

4
ext/standard/var_unserializer.re
View file

@ -444,7 +444,7 @@ string_key:
&& zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) { && zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) {
zend_property_info *existing_propinfo; zend_property_info *existing_propinfo;
zend_string *new_key; zend_string *new_key;
const char *unmangled_class = NULL; const char *unmangled_class = NULL;
const char *unmangled_prop; const char *unmangled_prop;
size_t unmangled_prop_len; size_t unmangled_prop_len;
zend_string *unmangled; zend_string *unmangled;
@ -457,7 +457,7 @@ string_key:
unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0); unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0);
existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled); existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled);
if ((existing_propinfo != NULL) if ((existing_propinfo != NULL)
&& (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) { && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) {
if (existing_propinfo->flags & ZEND_ACC_PROTECTED) { if (existing_propinfo->flags & ZEND_ACC_PROTECTED) {
new_key = zend_mangle_property_name( new_key = zend_mangle_property_name(