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

[Anatol Belski]

Commit:95ea1e7ca787537a93c25c401dba010d51aa8d59
Author:Anatol Belski  Sat, 11 May 2013 02:47:48 +0200
Parents:   b3f6cc20e009e04695b6ce76183c5af4dcdb
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=95ea1e7ca787537a93c25c401dba010d51aa8d59

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 967da6a..afeca90 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);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

[Ferenc Kovacs]

tyrael   Fri, 10 May 2013 12:10:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=330197

Log:
giving jas NEWS and UPGRADING as requested by Pierre

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-05-10 00:28:37 UTC (rev 330196)
+++ SVNROOT/global_avail2013-05-10 12:10:30 UTC (rev 330197)
@@ -185,7 +185,7 @@
 avail|fmk|php-src.git/ext/mssql
 avail|asautins,dbenson,maxim,ray,abonamous,ldixon|php-src.git/ext/oci8
 avail|kara,fmk,sschadt,nicos|php-src.git/ext/odbc
-avail|venaas,jas|php-src.git/ext/openssl
+avail|venaas,jas|php-src.git/ext/openssl,php-src.git/NEWS,php-src.git/UPGRADING
 avail|kara|php-src.git/ext/oracle,pecl/oracle
 avail|nmav|php-src.git/ext/ovrimos,pecl/ovrimos
 avail|steinm|php-src.git/ext/pdf

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php