summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-04-06 21:42:40 +0800
committerJohannes Schlüter <johannes@php.net>2012-04-12 11:04:39 +0200
commit8ccf0655776c512f1e1c341e115e07d0e8ba6091 (patch)
treee96e269e4846ba0a05aa68e518f5208b978891e3
parenta4e6394a06fb11f80426e94874d0702cf5235726 (diff)
downloadphp-git-8ccf0655776c512f1e1c341e115e07d0e8ba6091.tar.gz
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
-rw-r--r--main/SAPI.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 693cad3429..271fd21839 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -945,7 +945,9 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)
} else {
return NULL;
}
- sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);
+ if (sapi_module.input_filter) {
+ sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);
+ }
return value;
}
return NULL;