lbarnaud Tue Oct 21 22:06:07 2008 UTC Modified files: /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.168&r2=1.169&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.168 php-src/ext/spl/spl_directory.c:1.169 --- php-src/ext/spl/spl_directory.c:1.168 Fri Sep 12 16:24:12 2008 +++ php-src/ext/spl/spl_directory.c Tue Oct 21 22:06:05 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.168 2008/09/12 16:24:12 felipe Exp $ */ +/* $Id: spl_directory.c,v 1.169 2008/10/21 22:06:05 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -2340,8 +2340,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()) @@ -2381,8 +2381,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.179&r2=1.180&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.179 php-src/ext/spl/spl_iterators.c:1.180 --- php-src/ext/spl/spl_iterators.c:1.179 Mon Sep 22 13:06:28 2008 +++ php-src/ext/spl/spl_iterators.c Tue Oct 21 22:06:06 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.179 2008/09/22 13:06:28 felipe Exp $ */ +/* $Id: spl_iterators.c,v 1.180 2008/10/21 22:06:06 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1339,8 +1339,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; /* UTODO: class_name must be zstr */ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|s", &zobject, ce_inner, &class_name, &class_name_len) == FAILURE) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php