com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/soap/php _encoding.c
| From: | Nikita Popov | Date: | Tue, 13 Dec 2016 16:57:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/soap/php _encoding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96324@lists.php.net to get a copy of this message | ||
Commit: b344832b80c2e298621d596fe6f8c6ce1a745431
Author: Nikita Popov <nikic@php.net> Tue, 13 Dec 2016 17:57:14 +0100
Parents: 9eca4dca73d9a6517f773134949bf8613a7eee13 4b2cc62e266cb39d0728dc473435fdf6ab4e8e89
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b344832b80c2e298621d596fe6f8c6ce1a745431
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM ext/soap/php_encoding.c
Diff:
diff --cc ext/soap/php_encoding.c
index c6a3f86,245f1b3..412ecf2
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@@ -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;
}