MFH 1.243:

Fixed crash in php_ini_scanned_files() when no additional INI files were
actually parsed.

diff --git a/NEWS b/NEWS
index 6bb42edf687c551216fd7afee06c29e9196cfeee..75b063003917f48bd3520ed9f65c298fd3cbb6b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Feb 2004, Version 4.3.5
+- Fixed crash in php_ini_scanned_files() when no additional INI files were
+  actually parsed. (Jon)
 - Fixed possible crashes inside socket extension, due to missing check inside
   allocation functions. (Ilia)
 - Fixed bug #27590 (crash during shutdown when freeing persistent resources

diff --git a/ext/standard/info.c b/ext/standard/info.c
index a589c4464dd5c111a0c63771e6ed61a73bc0698b..ad0dd991118962f4b026b2b07bbe3080897db026 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -974,7 +974,7 @@ PHP_FUNCTION(php_uname)
 /* {{{ proto string php_ini_scanned_files(void)
    Return comma-separated string of .ini files parsed from the additional ini dir */
 PHP_FUNCTION(php_ini_scanned_files) {
-       if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+       if(strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
                RETURN_STRING(php_ini_scanned_files,1);
        } else RETURN_FALSE;
 }