|
 |
b74969 |
From 95ea1e7ca787537a93c25c401dba010d51aa8d59 Mon Sep 17 00:00:00 2001
|
|
|
b74969 |
From: Anatol Belski <ab@php.net>
|
|
|
b74969 |
Date: Sat, 11 May 2013 02:47:48 +0200
|
|
|
b74969 |
Subject: [PATCH] fixed variable corruption under win x64
|
|
|
b74969 |
|
|
|
b74969 |
---
|
|
|
b74969 |
ext/wddx/wddx.c | 8 ++++----
|
|
|
b74969 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
b74969 |
|
|
|
b74969 |
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
|
|
|
b74969 |
index 967da6a..afeca90 100644
|
|
|
b74969 |
--- a/ext/wddx/wddx.c
|
|
|
b74969 |
+++ b/ext/wddx/wddx.c
|
|
|
b74969 |
@@ -405,7 +405,7 @@ static void php_wddx_serialize_string(wddx_packet *packet, zval *var TSRMLS_DC)
|
|
|
b74969 |
|
|
|
b74969 |
if (Z_STRLEN_P(var) > 0) {
|
|
|
b74969 |
char *buf;
|
|
|
b74969 |
- int buf_len;
|
|
|
b74969 |
+ size_t buf_len;
|
|
|
b74969 |
|
|
|
b74969 |
buf = php_escape_html_entities(Z_STRVAL_P(var), Z_STRLEN_P(var), &buf_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
|
|
|
b74969 |
|
|
|
b74969 |
@@ -626,12 +626,12 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
|
|
|
b74969 |
*/
|
|
|
b74969 |
void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC)
|
|
|
b74969 |
{
|
|
|
b74969 |
- char *tmp_buf;
|
|
|
b74969 |
- char *name_esc;
|
|
|
b74969 |
- int name_esc_len;
|
|
|
b74969 |
HashTable *ht;
|
|
|
b74969 |
|
|
|
b74969 |
if (name) {
|
|
|
b74969 |
+ size_t name_esc_len;
|
|
|
b74969 |
+ char *tmp_buf, *name_esc;
|
|
|
b74969 |
+
|
|
|
b74969 |
name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
|
|
|
b74969 |
tmp_buf = emalloc(name_esc_len + sizeof(WDDX_VAR_S));
|
|
|
b74969 |
snprintf(tmp_buf, name_esc_len + sizeof(WDDX_VAR_S), WDDX_VAR_S, name_esc);
|
|
|
b74969 |
--
|
|
|
b74969 |
2.1.4
|
|
|
b74969 |
|