summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-05-11 02:47:48 +0200
committerRemi Collet <remi@php.net>2014-08-20 15:08:52 +0200
commit20941b71aae2775b1364a681916c61e71861ce17 (patch)
tree54823201be5aa61c7cd2fa030167f7ad0b53b0ae
parent276bead9c47e91fa3fffce87a6911eaafdb1f8ab (diff)
downloadphp-git-20941b71aae2775b1364a681916c61e71861ce17.tar.gz
fixed variable corruption under win x64
-rw-r--r--ext/wddx/wddx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index b0a6b82dfe..bc0244e358 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);