com php-src: Fix incorrect merge: NEWS ext/wddx/wddx.c

From: Date: Sat, 30 Jul 2016 14:07:54 +0000
Subject: com php-src: Fix incorrect merge: NEWS ext/wddx/wddx.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93491@lists.php.net to get a copy of this message
Commit: 029f8e87772f27efdee48719b266e99b0a102543 Author: Nikita Popov <nikic@php.net> Sat, 30 Jul 2016 16:07:54 +0200 Parents: 1f67b4c24d780c1b9018bd34b538de59e3ed2d89 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=029f8e87772f27efdee48719b266e99b0a102543 Log: Fix incorrect merge Forgot to amend the merge fixes... Changed paths: M NEWS M ext/wddx/wddx.c Diff: diff --git a/NEWS b/NEWS index babe2c2...cdf37e9 100644 --- a/NEWS +++ b/NEWS @@ -133,6 +133,9 @@ PHP NEWS - Wddx: . Fixed bug #72564 (boolean always deserialized as "true") (Remi) + . Fixed bug #72142 (WDDX Packet Injection Vulnerability in + wddx_serialize_value()). (Taoguang Chen) + - Zip: . Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd). diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index ed96a0d..d28cb7a 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); }

« previous php.cvs (#93491) next »