lbarnaud Mon Nov 24 19:16:51 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fixed some conditional jumps depending on uninitialised value
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.938&r2=1.939&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.938
php-src/ext/standard/basic_functions.c:1.939
--- php-src/ext/standard/basic_functions.c:1.938 Mon Nov 17 11:26:24 2008
+++ php-src/ext/standard/basic_functions.c Mon Nov 24 19:16:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.938 2008/11/17 11:26:24 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.939 2008/11/24 19:16:51 lbarnaud Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3657,6 +3657,7 @@
memset(BG(strtok_table), 0, 256);
BG(strtok_string) = NULL;
BG(strtok_zval) = NULL;
+ BG(strtok_last) = NULL;
BG(locale_string) = NULL;
BG(array_walk_fci) = empty_fcall_info;
BG(array_walk_fci_cache) = empty_fcall_info_cache;
@@ -5986,7 +5987,7 @@
zval **pp_filename;
char *filename;
int filename_len;
- zend_bool process_sections;
+ zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_file_handle fh;
zend_ini_parser_cb_t ini_parser_cb;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
