MFH: Added safety checks

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 595d2c03fee10acb4555d4a654ece21bf4438ea1..fa9908248921b276cf5043c86138e02243b89411 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -56,13 +56,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);
 }