initialize optional vars

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 4f1d856ad7331136d409ad734e6ab0743db53152..8a90f1d20a07d226884e94682df47d123bb217ad 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1286,11 +1286,11 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_repl
                                   **replace,
                                   **subject,
                                   **subject_entry,
-                                  **zcount;
+                                  **zcount = NULL;
        char                    *result;
        int                              result_len;
        int                              limit_val = -1;
-       long                    limit;
+       long                    limit = -1;
        char                    *string_key;
        ulong                    num_key;
        char                    *callback_name;
@@ -1607,7 +1607,7 @@ static PHP_FUNCTION(preg_quote)
        int              in_str_len;
        char    *in_str;                /* Input string argument */
        char    *in_str_end;    /* End of the input string */
-       int              delim_len;
+       int              delim_len = 0;
        char    *delim = NULL;  /* Additional delimiter argument */
        char    *out_str,               /* Output string with quoted characters */
                        *p,                             /* Iterator for input string */

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 334e1dc6d36a00e08268a655ebb0a6a7d9c81474..cbe02cabe7662f4db2730938a50ebe990adcb3f8 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2186,8 +2186,8 @@ SPL_METHOD(SplFileObject, fgetcsv)
 {
        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_METHOD(SplFileObject, setCsvControl)
 {
        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())

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 475f3ccd4437e32a980cefad4238cf420eabc0b9..475604bc4494c4686138ff1349d14f53bfde0f67 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1287,8 +1287,8 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
                }
                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;