diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
| commit | daf3d0c875634547748b791fb6291e78103bf6dc (patch) | |
| tree | 667c296cf01f1d81a0b0199eb2245c6abb1fed19 /ext/soap/php_encoding.c | |
| parent | 3ac63df9bc27226c25cca5c87804896d33a7ab4f (diff) | |
| parent | aeb5319336aa447ad24968479b8aa249dd4c43a7 (diff) | |
| download | php-git-daf3d0c875634547748b791fb6291e78103bf6dc.tar.gz | |
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 5d9064af70..1fdc5a8788 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -3014,7 +3014,11 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP xmlFreeNode(dummy); } ZEND_HASH_FOREACH_END(); smart_str_0(&list); - xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s)); + if (list.s) { + xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s)); + } else { + xmlNodeSetContentLen(ret, BAD_CAST(""), 0); + } smart_str_free(&list); } else { zval tmp; @@ -3054,7 +3058,11 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP start = next; } smart_str_0(&list); - xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s)); + if (list.s) { + xmlNodeSetContentLen(ret, BAD_CAST(ZSTR_VAL(list.s)), ZSTR_LEN(list.s)); + } else { + xmlNodeSetContentLen(ret, BAD_CAST(""), 0); + } smart_str_free(&list); efree(str); if (data == &tmp) {zval_dtor(&tmp);} |