lbarnaud Tue Oct 21 22:08:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_directory.c spl_iterators.c Log: initialize optional vars http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.31&r2=1.45.2.27.2.23.2.32&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.31 php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.32 --- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.31 Thu Sep 11 15:31:58 2008 +++ php-src/ext/spl/spl_directory.c Tue Oct 21 22:08:20 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.31 2008/09/11 15:31:58 lbarnaud Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.32 2008/10/21 22:08:20 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -2186,8 +2186,8 @@ { spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC); char delimiter = intern->u.file.delimiter, enclosure = intern->u.file.enclosure, escape = intern->u.file.escape; - char *delim, *enclo, *esc; - int d_len, e_len, esc_len; + char *delim = NULL, *enclo = NULL, *esc = NULL; + int d_len = 0, e_len = 0, esc_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sss", &delim, &d_len, &enclo, &e_len, &esc, &esc_len) == SUCCESS) { switch(ZEND_NUM_ARGS()) @@ -2227,8 +2227,8 @@ { spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC); char delimiter = ',', enclosure = '"', escape='\\'; - char *delim, *enclo, *esc; - int d_len, e_len, esc_len; + char *delim = NULL, *enclo = NULL, *esc = NULL; + int d_len = 0, e_len = 0, esc_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sss", &delim, &d_len, &enclo, &e_len, &esc, &esc_len) == SUCCESS) { switch(ZEND_NUM_ARGS()) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.15&r2=1.73.2.30.2.28.2.16&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.15 php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.16 --- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.15 Mon Sep 22 13:09:09 2008 +++ php-src/ext/spl/spl_iterators.c Tue Oct 21 22:08:20 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.15 2008/09/22 13:09:09 felipe Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.16 2008/10/21 22:08:20 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1287,8 +1287,8 @@ } case DIT_IteratorIterator: { zend_class_entry **pce_cast; - char * class_name; - int class_name_len; + char * class_name = NULL; + int class_name_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|s", &zobject, ce_inner, &class_name, &class_name_len) == FAILURE) { return NULL;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php