summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2003-02-28 20:44:47 +0000
committerRasmus Lerdorf <rasmus@php.net>2003-02-28 20:44:47 +0000
commit70432e3befe4af2005757e59fb6c2a84395f7529 (patch)
tree48d6b0049e3ec1b25b1ecf7de29e9c05e59b2f1e /main/php_ini.c
parent18e06aefeef7241f36bd0221da3a9b885071b3f6 (diff)
downloadphp-git-70432e3befe4af2005757e59fb6c2a84395f7529.tar.gz
@- Crash bug fix. If config-file-scan-dir is set and contains .ini files
but there is no top php.ini file, we would get a segfault. (Rasmus)
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 84751b3a68..309a0e6c92 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -415,6 +415,7 @@ int php_init_config()
if (S_ISREG(sb.st_mode)) {
if ((fh.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
fh.filename = ini_file;
+ fh.type = ZEND_HANDLE_FP;
zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
/* Here, add it to the list of ini files read */
l = strlen(ini_file);