MFH: Added safety checks

Ilia Alshanetsky · Ilia Alshanetsky · commit acdab8fe5e82 · 2006-01-01T20:13:44.000Z
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
@@ -58,13 +58,11 @@ php_apache2_info_struct php_apache2_info;
 
 static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
 {
-	php_struct *ctx;
+	php_struct *ctx = SG(server_context);
 	
-	if (!filename) {
+	if (!filename || !ctx || !ctx->r) {
 		return NULL;
 	}
-	
-	ctx = SG(server_context);
 
 	return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
 }

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,11 @@ php_apache2_info_struct php_apache2_info;`
`58`	`58`
`59`	`59`	`static request_rec php_apache_lookup_uri(char filename TSRMLS_DC)`
`60`	`60`	`{`
`61`		`- php_struct *ctx;`
	`61`	`+ php_struct *ctx = SG(server_context);`
`62`	`62`
`63`		`- if (!filename) {`
	`63`	`+ if (!filename \|\| !ctx \|\| !ctx->r) {`
`64`	`64`	`return NULL;`
`65`	`65`	`}`
`66`		`-`
`67`		`- ctx = SG(server_context);`
`68`	`66`
`69`	`67`	`return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);`
`70`	`68`	`}`