From: Jon Parise <jon@php.net>
Date: Mon, 15 Mar 2004 16:39:53 +0000 (+0000)
Subject: MFH 1.243:
X-Git-Tag: php-4.3.5RC4~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb7f2e421024bc2d419d79195eab6c043d9a4586;p=php

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 6bb42edf68..75b0630039 100644
--- 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 a589c4464d..ad0dd99111 100644
--- 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;
 }