From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 1 Jan 2006 20:13:31 +0000 (+0000)
Subject: MFB51: Added safety checks
X-Git-Tag: RELEASE_1_0_4~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14b8cbedb75abb17024e38fac0f21a3b2b7a8359;p=php

MFB51: Added safety checks
---

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 557a109964..f6a0cab4d3 100644
--- 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);
 }