diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-06 21:42:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-06 21:42:40 +0800 |
| commit | 9bf8cd4b3437f6335e20843c9e3668b44761feba (patch) | |
| tree | 0fa42948039c90fdedaad22fc4b4362d85a2084d | |
| parent | 381edb425e16bd5d472c84d757465aa42cb39d0f (diff) | |
| download | php-git-9bf8cd4b3437f6335e20843c9e3668b44761feba.tar.gz | |
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | main/SAPI.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -18,7 +18,9 @@ PHP NEWS (merge after 5.3.11 release) - Core: - - Fixed bug #61605 (header_remove() does not remove all headers). + . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables + (without apache2)). (Laruence) + . Fixed bug #61605 (header_remove() does not remove all headers). (Laruence) . Fixed bug #61541 (Segfault when using ob_* in output_callback). (reeze.xia@gmail.com) 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; |