]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Tue, 13 Dec 2016 16:57:14 +0000 (17:57 +0100)
committerNikita Popov <nikic@php.net>
Tue, 13 Dec 2016 16:57:14 +0000 (17:57 +0100)
1  2 
ext/soap/php_encoding.c

index c6a3f865cb0e605ea6a234429a6773e63f460b65,245f1b3e6109275946ec5e3c7dc94065af3d7cbe..412ecf2fb6a790615bab218a6a91cec8b390b6ec
@@@ -1194,14 -1215,11 +1210,11 @@@ static zval* get_zval_property(zval* ob
                        return NULL;
                }
                zval_ptr_dtor(&member);
 -              EG(scope) = old_scope;
 +              EG(fake_scope) = old_scope;
+               ZVAL_DEREF(data);
                return data;
        } else if (Z_TYPE_P(object) == IS_ARRAY) {
-               zval *data_ptr;
-               if ((data_ptr = zend_hash_str_find(Z_ARRVAL_P(object), name, strlen(name))) != NULL) {
-                 return data_ptr;
-               }
+               return soap_hash_str_find_deref(Z_ARRVAL_P(object), name, strlen(name));
        }
        return NULL;
  }