MFH: Fixed bug #30050 (Possible crash inside php_shutdown_config()).

diff --git a/NEWS b/NEWS
index 04975a74c6772c015bc3b10f58c79cc449e4c6c5..b7c74195ee3ee16233fb2179a61d9985e3f76ad7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 14 Sep 2004, Version 4.3.9RC3
 - GPC input processing fixes (Stefano Di Paola, Rasmus, Stefan)
+- Fixed bug #30050 (Possible crash inside php_shutdown_config()). 
+  (Ilia, nw at softwarekombinat dot de)
 
 31 Aug 2004, Version 4.3.9RC2
 - Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory

diff --git a/main/php_ini.c b/main/php_ini.c
index 95cb22160d9885d4d8bb2cdea95efae4c70db766..f17fd5823672420fcaf9d5aadde16d81fe808ede 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -484,9 +484,11 @@ int php_shutdown_config(void)
        zend_hash_destroy(&configuration_hash);
        if (php_ini_opened_path) {
                free(php_ini_opened_path);
+               php_ini_opened_path = NULL;
        }
        if (php_ini_scanned_files) {
                free(php_ini_scanned_files);
+               php_ini_scanned_files = NULL;
        }
        return SUCCESS;
 }