jon Mon Mar 15 11:39:58 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard info.c
Log:
MFH 1.243:
Fixed crash in php_ini_scanned_files() when no additional INI files were
actually parsed.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.595&r2=1.1247.2.596&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.595 php-src/NEWS:1.1247.2.596
--- php-src/NEWS:1.1247.2.595 Mon Mar 15 11:07:57 2004
+++ php-src/NEWS Mon Mar 15 11:39:52 2004
@@ -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
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.218.2.14&r2=1.218.2.15&ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.218.2.14 php-src/ext/standard/info.c:1.218.2.15
--- php-src/ext/standard/info.c:1.218.2.14 Mon Sep 22 00:18:39 2003
+++ php-src/ext/standard/info.c Mon Mar 15 11:39:53 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.218.2.14 2003/09/22 04:18:39 iliaa Exp $ */
+/* $Id: info.c,v 1.218.2.15 2004/03/15 16:39:53 jon Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -974,7 +974,7 @@
/* {{{ 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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
