summaryrefslogtreecommitdiff
path: root/ext/soap/php_encoding.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2010-06-15 08:22:51 +0000
committerDmitry Stogov <dmitry@php.net>2010-06-15 08:22:51 +0000
commit3d5f7291819bbef5442f83b82202ebd0e67162b9 (patch)
tree11bd6b52878c934b224076d77feb35c02fa0e864 /ext/soap/php_encoding.c
parent0da5464a811ef1c19620339fff4143261c5abeef (diff)
downloadphp-git-3d5f7291819bbef5442f83b82202ebd0e67162b9.tar.gz
Fixed bug #52041 (Memory leak when writing on uninitialized variable returned from function)
Diffstat (limited to 'ext/soap/php_encoding.c')
-rw-r--r--ext/soap/php_encoding.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 3e63dbe02a..bc2df3cd0c 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1562,8 +1562,13 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e
}
model_to_zval_object(ret, sdlType->model, data, sdl TSRMLS_CC);
if (redo_any) {
- if (get_zval_property(ret, "any" TSRMLS_CC) == NULL) {
+ zval *tmp = get_zval_property(ret, "any" TSRMLS_CC);
+
+ if (tmp == NULL) {
model_to_zval_any(ret, data->children TSRMLS_CC);
+ } else if (Z_REFCOUNT_P(tmp) == 0) {
+ zval_dtor(tmp);
+ efree(tmp);
}
zval_ptr_dtor(&redo_any);
}