Initialize all zend_file_handle instances properly

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9286b271ea79a7e7387a67dde66c90118b7338f5..a5273bc1f042e3ee25166c2485f60f8e56bcb04d 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2839,7 +2839,7 @@ static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int callback
 PHP_FUNCTION(parse_ini_file)
 {
        zval **filename, **process_sections;
-       zend_file_handle fh;
+       zend_file_handle fh = {0};
        zend_ini_parser_cb_t ini_parser_cb;
 
        switch (ARG_COUNT(ht)) {

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index d438b5d091fe4117668c509fd4adc830df8f7372..9a7ed303e26859baccd6eb0fbb7b874c6780c159 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -150,7 +150,7 @@ PHP_MINIT_FUNCTION(browscap)
        char *browscap = INI_STR("browscap");
 
        if (browscap) {
-               zend_file_handle fh;
+               zend_file_handle fh = {0};
 
                if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) browscap_entry_dtor, 1)==FAILURE) {
                        return FAILURE;

diff --git a/main/main.c b/main/main.c
index b969dcb0cea758e061fb388c922a80b49f72cf6b..ab2032c093fe6d2d253c576956a80bf36e181553 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1600,7 +1600,7 @@ PHPAPI int php_handle_special_queries(TSRMLS_D)
 PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 {
        zend_file_handle *prepend_file_p, *append_file_p;
-       zend_file_handle prepend_file, append_file;
+       zend_file_handle prepend_file = {0}, append_file = {0};
 #if HAVE_BROKEN_GETCWD 
        int old_cwd_fd = -1;
 #else

diff --git a/main/php_ini.c b/main/php_ini.c
index 2be34595776fd9d1bfa1deb9482e01474b11b9e5..c30818965b6b95b682b7356dd92640e5ea1dab21 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -236,7 +236,7 @@ int php_init_config()
        int safe_mode_state;
        char *open_basedir;
        int free_ini_search_path=0;
-       zend_file_handle fh;
+       zend_file_handle fh = {0};
        struct stat sb;
        char ini_file[MAXPATHLEN];
        char *p;
@@ -347,7 +347,6 @@ int php_init_config()
        PG(safe_mode) = 0;
        PG(open_basedir) = NULL;
 
-       memset(&fh, 0, sizeof(fh));
        /* Check if php_ini_path_override is a file */
        if (!sapi_module.php_ini_ignore) {
                if (sapi_module.php_ini_path_override && sapi_module.php_ini_path_override[0]) {