com php-src: fixed variable corruption under win x64: ext/wddx/wddx.c

Commit: 20941b71aae2775b1364a681916c61e71861ce17 Author: Anatol Belski <ab@php.net> Sat, 11 May 2013 02:47:48 +0200 Committer: Remi Collet <remi@php.net> Wed, 20 Aug 2014 15:08:52 +0200 Parents: 276bead9c47e91fa3fffce87a6911eaafdb1f8ab Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20941b71aae2775b1364a681916c61e71861ce17 Log: fixed variable corruption under win x64 Changed paths: M ext/wddx/wddx.c Diff: diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index b0a6b82..bc0244e 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -405,7 +405,7 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var TSRMLS_DC) if (Z_STRLEN_P(var) > 0) { char *buf; - int buf_len; + size_t buf_len; buf = php_escape_html_entities(Z_STRVAL_P(var), Z_STRLEN_P(var), &buf_len, 0, ENT_QUOTES, NULL TSRMLS_CC); @@ -626,12 +626,12 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr) */ void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC) { - char *tmp_buf; - char *name_esc; - int name_esc_len; HashTable *ht; if (name) { + size_t name_esc_len; + char *tmp_buf, *name_esc; + name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC); tmp_buf = emalloc(name_esc_len + sizeof(WDDX_VAR_S)); snprintf(tmp_buf, name_esc_len + sizeof(WDDX_VAR_S), WDDX_VAR_S, name_esc);