diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-30 16:08:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-30 16:08:30 +0200 |
| commit | f9be9b1a725e5f975318d2639e7e05052b8380b3 (patch) | |
| tree | 3a10d949a6a74e9166667e7f88a0859f31a0f47b | |
| parent | be836ea4fb874f3221067215b3c3ab227240a3ce (diff) | |
| parent | 029f8e87772f27efdee48719b266e99b0a102543 (diff) | |
| download | php-git-f9be9b1a725e5f975318d2639e7e05052b8380b3.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/wddx/wddx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 6a4034b1eb..d2171b47c3 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -360,18 +360,16 @@ void php_wddx_packet_start(wddx_packet *packet, char *comment, size_t comment_le { php_wddx_add_chunk_static(packet, WDDX_PACKET_S); if (comment) { - char *escaped; - size_t escaped_len; - escaped = php_escape_html_entities( - comment, comment_len, &escaped_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + zend_string *escaped = php_escape_html_entities( + comment, comment_len, 0, ENT_QUOTES, NULL); php_wddx_add_chunk_static(packet, WDDX_HEADER_S); php_wddx_add_chunk_static(packet, WDDX_COMMENT_S); - php_wddx_add_chunk_ex(packet, escaped, escaped_len); + php_wddx_add_chunk_ex(packet, ZSTR_VAL(escaped), ZSTR_LEN(escaped)); php_wddx_add_chunk_static(packet, WDDX_COMMENT_E); php_wddx_add_chunk_static(packet, WDDX_HEADER_E); - str_efree(escaped); + zend_string_release(escaped); } else { php_wddx_add_chunk_static(packet, WDDX_HEADER); } |