diff options
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 86d2c80b76..b450ebb149 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -242,6 +242,7 @@ zval *to_zval_user(encodeType type, xmlNodePtr node) if(call_user_function(EG(function_table), NULL, type.map->map_functions.to_zval, ret, 1, ¶m TSRMLS_CC) == FAILURE) php_error(E_ERROR, "Error calling to_zval"); zval_ptr_dtor(¶m); + efree(param); } return ret; } @@ -286,7 +287,7 @@ zval *to_zval_stringl(encodeType type, xmlNodePtr data) xmlNodePtr to_xml_string(encodeType type, zval *data, int style) { xmlNodePtr ret; - char *str; + char *str, *pstr; int new_len; ret = xmlNewNode(NULL, "BOGUS"); @@ -294,7 +295,13 @@ xmlNodePtr to_xml_string(encodeType type, zval *data, int style) convert_to_string(data); str = php_escape_html_entities(Z_STRVAL_P(data), Z_STRLEN_P(data), &new_len, 0, 0, NULL); - xmlNodeSetContentLen(ret, str, new_len); + + pstr = malloc(new_len + 1); + memcpy(pstr, str, new_len); + pstr[new_len] = '\0'; + efree(str); + + xmlNodeSetContentLen(ret, pstr, new_len); if(style == SOAP_ENCODED) set_ns_and_type(ret, type); |