com php-src: Fixed <any> with XML references: ext/soap/php_en coding.c
| From: | Dmitry Stogov | Date: | Fri, 16 May 2014 14:11:28 +0000 |
| Subject: | com php-src: Fixed <any> with XML references: ext/soap/php_en coding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78416@lists.php.net to get a copy of this message | ||
Commit: e159955d15ba7d43ceb2c32d1b7705ef6cf2d25e
Author: Dmitry Stogov <dmitry@zend.com> Fri, 16 May 2014 18:11:28 +0400
Parents: 89dbe074496dcb33484c207347702e51589de943
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e159955d15ba7d43ceb2c32d1b7705ef6cf2d25e
Log:
Fixed <any> with XML references
Changed paths:
M ext/soap/php_encoding.c
Diff:
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 795a376..aea31c9 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1494,11 +1494,10 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr
data, z
} else {
master_to_zval_int(ret, sdlType->encode, data TSRMLS_CC);
}
- if (soap_check_xml_ref(ret, data TSRMLS_CC)) {
- return ret;
- }
- redo_any = get_zval_property(ret, "any", &rv TSRMLS_CC);
+
soap_add_xml_ref(ret, data TSRMLS_CC);
+
+ redo_any = get_zval_property(ret, "any", &rv TSRMLS_CC);
if (Z_TYPE_P(ret) == IS_OBJECT && ce != ZEND_STANDARD_CLASS_DEF_PTR) {
zend_object *zobj = Z_OBJ_P(ret);
zobj->ce = ce;
@@ -1526,18 +1525,14 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr
data, z
soap_add_xml_ref(ret, data TSRMLS_CC);
}
if (sdlType->model) {
- if (redo_any) {
- if (Z_REFCOUNTED_P(redo_any)) Z_ADDREF_P(redo_any);
- unset_zval_property(ret, "any" TSRMLS_CC);
- }
model_to_zval_object(ret, sdlType->model, data, sdl TSRMLS_CC);
if (redo_any) {
- zval *tmp = get_zval_property(ret, "any", &rv TSRMLS_CC);
-
- if (tmp == NULL) {
+ if (!get_zval_property(ret, "any", &rv TSRMLS_CC)) {
model_to_zval_any(ret, data->children TSRMLS_CC);
+ soap_add_xml_ref(ret, data TSRMLS_CC);
+ } else {
+ unset_zval_property(ret, "any" TSRMLS_CC);
}
- zval_ptr_dtor(redo_any);
}
}
if (sdlType->attributes) {