diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-06 21:57:56 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-06 21:57:56 +0800 |
| commit | b0f09b69d38a05102703329b51d7fae4d2433b54 (patch) | |
| tree | ad90720b8135ef2329c3c187d61fb9a5679e7687 | |
| parent | 69b2570b72a643f28135ebaf89ab1188d6cd7d45 (diff) | |
| parent | 9bf8cd4b3437f6335e20843c9e3668b44761feba (diff) | |
| download | php-git-b0f09b69d38a05102703329b51d7fae4d2433b54.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
| -rw-r--r-- | main/SAPI.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 0d3b4ef17a..fc4b7bee84 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -1016,7 +1016,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; |