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

laruence · johannes · commit 8ccf0655776c · 2012-04-12T11:04:39.000+02:00
diff --git a/main/SAPI.c b/main/SAPI.c
@@ -945,7 +945,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
`@@ -945,7 +945,9 @@ SAPI_API char sapi_getenv(char name, size_t name_len TSRMLS_DC)`
`945`	`945`	`} else {`
`946`	`946`	`return NULL;`
`947`	`947`	`}`
`948`		`- sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`948`	`+ if (sapi_module.input_filter) {`
	`949`	`+ sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`950`	`+ }`
`949`	`951`	`return value;`
`950`	`952`	`}`
`951`	`953`	`return NULL;`