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

laruence · laruence · commit 9bf8cd4b3437 · 2012-04-06T21:42:40.000+08:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,9 @@ SAPI_API char sapi_getenv(char name, size_t name_len TSRMLS_DC)`
`980`	`980`	`} else {`
`981`	`981`	`return NULL;`
`982`	`982`	`}`
`983`		`- sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`983`	`+ if (sapi_module.input_filter) {`
	`984`	`+ sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`985`	`+ }`
`984`	`986`	`return value;`
`985`	`987`	`}`
`986`	`988`	`return NULL;`