summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-04-06 21:42:40 +0800
committerXinchen Hui <laruence@php.net>2012-04-06 21:42:40 +0800
commit9bf8cd4b3437f6335e20843c9e3668b44761feba (patch)
tree0fa42948039c90fdedaad22fc4b4362d85a2084d /main
parent381edb425e16bd5d472c84d757465aa42cb39d0f (diff)
downloadphp-git-9bf8cd4b3437f6335e20843c9e3668b44761feba.tar.gz
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index df550e0249..05644df11d 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -980,7 +980,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;