Permalink
Browse files

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

actually parsed.

I'll merge this into the PHP_4_3 branch as soon as I receive permission
from the release master.
  • Loading branch information...
1 parent 111d046 commit 633c95aa40939b9a3086035654ca83697056bde5 @jparise jparise committed Mar 15, 2004
Showing with 3 additions and 1 deletion.
  1. +2 −0 NEWS
  2. +1 −1 ext/standard/info.c
View
2 NEWS
@@ -34,6 +34,8 @@ PHP NEWS
- Methods that override parent methods are now subject to prototype checking,
and have to be compatible with the method they're overriding - this check is
disabled in compatibility mode. (Andi, Zeev)
+- Fixed crash in php_ini_scanned_files() when no additional INI files were
+ actually parsed. (Jon)
- Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
x1 < x2 and y1 < y2 for coordinates. (Derick)
- Fixed crash with foreach() and temporary objects($obj->method()->a ...) where
View
@@ -1080,7 +1080,7 @@ PHP_FUNCTION(php_uname)
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;

0 comments on commit 633c95a

Please sign in to comment.