diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-16 09:15:55 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-16 09:15:55 +0200 |
| commit | c062b889f896c543947df688ae18d81dbe11deb0 (patch) | |
| tree | 7fcc579082f4d9b2eff9ae018da6187f2afc998d /ext/soap/php_encoding.c | |
| parent | 3ebd7ec9cfd8831ab7ffa0c8f422ab9d303e357f (diff) | |
| parent | b258b112a425bfd94c3765e27e3b1bec9124a3ca (diff) | |
| download | php-git-c062b889f896c543947df688ae18d81dbe11deb0.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui (3) and Dmitry Stogov (2)
# Via Xinchen Hui (3) and Dmitry Stogov (2)
* 'phpng' of git.php.net:php-src:
Fixed iterator destruction
Fixed uninitialized value used
Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk)
Fixed memory leaks
Fixed several test failed
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 8ea419dc1b..69dcbec517 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2301,7 +2301,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod } } iterator_done: - iter->funcs->dtor(iter TSRMLS_CC); + OBJ_RELEASE(&iter->std); if (EG(exception)) { zval_ptr_dtor(&array_copy); ZVAL_UNDEF(&array_copy); |