]> granicus.if.org Git - php/commitdiff
fixed variable corruption under win x64
authorAnatol Belski <ab@php.net>
Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)
committerRemi Collet <remi@php.net>
Wed, 20 Aug 2014 13:08:52 +0000 (15:08 +0200)
ext/wddx/wddx.c

index b0a6b82dfea146f5cc708a1d89b591b2b24ff522..bc0244e358e10507aad3a8f4a08a893f35712f68 100644 (file)
@@ -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);