cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/standard var_unserializer.c var_unserializer.re /main php_variables.c /sapi/cli php_cli_readline.c

nlopess Sat Sep 29 11:18:42 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/openssl xp_ssl.c /php-src/ext/standard var_unserializer.c var_unserializer.re /php-src/main php_variables.c /php-src/sapi/cli php_cli_readline.c Log: fix a few compiler warnings (mostly use of unitialized values) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9&r2=1.22.2.3.2.9.2.1&diff_format=u Index: php-src/ext/openssl/xp_ssl.c diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9 php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.1 --- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9 Mon Jul 2 16:42:10 2007 +++ php-src/ext/openssl/xp_ssl.c Sat Sep 29 11:18:41 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.22.2.3.2.9 2007/07/02 16:42:10 iliaa Exp $ */ +/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.1 2007/09/29 11:18:41 nlopess Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -490,8 +490,8 @@ zend_list_insert(mycert, php_openssl_get_x509_list_id())); add_next_index_zval(arr, zcert); - } efree(zcert); + } } else { ZVAL_NULL(arr); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7&r2=1.70.2.4.2.7.2.1&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7 php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.1 --- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7 Mon Aug 6 18:33:29 2007 +++ php-src/ext/standard/var_unserializer.c Sat Sep 29 11:18:41 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.12.1 on Mon Aug 6 21:32:14 2007 */ +/* Generated by re2c 0.12.0 on Sat Sep 29 11:44:15 2007 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.70.2.4.2.7 2007/08/06 18:33:29 jani Exp $ */ +/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.1 2007/09/29 11:18:41 nlopess Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -334,7 +334,7 @@ (*p) += 2; if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.6&r2=1.52.2.2.2.6.2.1&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6 php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.1 --- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6 Mon Aug 6 18:23:16 2007 +++ php-src/ext/standard/var_unserializer.re Sat Sep 29 11:18:41 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.52.2.2.2.6 2007/08/06 18:23:16 jani Exp $ */ +/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.1 2007/09/29 11:18:41 nlopess Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -338,7 +338,7 @@ (*p) += 2; if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.104.2.10.2.11&r2=1.104.2.10.2.11.2.1&diff_format=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.104.2.10.2.11 php-src/main/php_variables.c:1.104.2.10.2.11.2.1 --- php-src/main/php_variables.c:1.104.2.10.2.11 Wed Jul 18 11:46:50 2007 +++ php-src/main/php_variables.c Sat Sep 29 11:18:41 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.104.2.10.2.11 2007/07/18 11:46:50 tony2001 Exp $ */ +/* $Id: php_variables.c,v 1.104.2.10.2.11.2.1 2007/09/29 11:18:41 nlopess Exp $ */ #include <stdio.h> #include "php.h" @@ -130,11 +130,12 @@ if (track_vars_array) { ht = Z_ARRVAL_P(track_vars_array); + zend_hash_del(ht, var, var_len + 1); } else if (PG(register_globals)) { ht = EG(active_symbol_table); + zend_hash_del(ht, var, var_len + 1); } - zend_hash_del(ht, var, var_len + 1); zval_dtor(val); /* do not output the error message to the screen, http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli_readline.c?r1=1.3.2.5.2.3&r2=1.3.2.5.2.3.2.1&diff_format=u Index: php-src/sapi/cli/php_cli_readline.c diff -u php-src/sapi/cli/php_cli_readline.c:1.3.2.5.2.3 php-src/sapi/cli/php_cli_readline.c:1.3.2.5.2.3.2.1 --- php-src/sapi/cli/php_cli_readline.c:1.3.2.5.2.3 Mon Jun 4 09:47:54 2007 +++ php-src/sapi/cli/php_cli_readline.c Sat Sep 29 11:18:42 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli_readline.c,v 1.3.2.5.2.3 2007/06/04 09:47:54 tony2001 Exp $ */ +/* $Id: php_cli_readline.c,v 1.3.2.5.2.3.2.1 2007/09/29 11:18:42 nlopess Exp $ */ #include "php.h" @@ -362,7 +362,7 @@ - future: respect scope ("php > function foo() { $[tab]" should only expand to local variables...) */ - char *retval; + char *retval = NULL; int textlen = strlen(text); TSRMLS_FETCH();