com php-src: Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)): NEWS main/SAPI.c

Commit: 9bf8cd4b3437f6335e20843c9e3668b44761feba Author: Xinchen Hui <laruence@php.net> Fri, 6 Apr 2012 21:42:40 +0800 Parents: 381edb425e16bd5d472c84d757465aa42cb39d0f Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9bf8cd4b3437f6335e20843c9e3668b44761feba Log: Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) Bugs: https://bugs.php.net/61650 Changed paths: M NEWS M main/SAPI.c Diff: diff --git a/NEWS b/NEWS index 6eff5c3..a660a91 100644 --- a/NEWS +++ b/NEWS @@ -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 df550e0..05644df 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;