Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))

15 years ago · 9bf8cd4b34
2 changed files with 6 additions and 2 deletions
--- a/4
+++ b/4
@ -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)
--- 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;