com php-src: Fixed get_zval_property(): ext/soap/ph p_encoding.c

Commit: d1c539ce676386c9a6d7f92cd8c941ac59a61770 Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 May 2014 12:11:24 +0400 Parents: 926388620bd48509af203997b22090e086b937e2 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d1c539ce676386c9a6d7f92cd8c941ac59a61770 Log: Fixed get_zval_property() Changed paths: M ext/soap/php_encoding.c Diff: diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 4491c10..9afaa51 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1206,17 +1206,18 @@ static zval* get_zval_property(zval* object, char* name, zval *rv TSRMLS_DC) ZVAL_STRING(&member, name); old_scope = EG(scope); EG(scope) = Z_OBJCE_P(object); - data = Z_OBJ_HT_P(object)->read_property(object, &member, BP_VAR_IS, 0, &rv TSRMLS_CC); + data = Z_OBJ_HT_P(object)->read_property(object, &member, BP_VAR_IS, -1, &rv TSRMLS_CC); if (data == &EG(uninitialized_zval)) { /* Hack for bug #32455 */ zend_property_info *property_info; property_info = zend_get_property_info(Z_OBJCE_P(object), &member, 1 TSRMLS_CC); - zval_ptr_dtor(&member); EG(scope) = old_scope; if (property_info && zend_hash_exists(Z_OBJPROP_P(object), property_info->name)) { + zval_ptr_dtor(&member); return data; } + zval_ptr_dtor(&member); return NULL; } zval_ptr_dtor(&member);