From: Stefan Fritsch <sf@apache.org>
Date: Mon, 27 Sep 2010 14:34:29 +0000 (+0000)
Subject: fix another null pointer dereference found by clang
X-Git-Tag: 2.3.9~413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c04f751a740b839e7768e25fdfe8e6fb4f20a47;p=thirdparty%2Fapache%2Fhttpd.git

fix another null pointer dereference found by clang


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1001757 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 2b14198c218..c05ed06403c 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -255,9 +255,11 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
         }
         /* all other env-variables from the parent Apache process */
         else if (strlen(var) > 4 && strcEQn(var, "ENV:", 4)) {
-            result = apr_table_get(r->notes, var+4);
-            if (result == NULL)
-                result = apr_table_get(r->subprocess_env, var+4);
+            if (r != NULL) {
+                result = apr_table_get(r->notes, var+4);
+                if (result == NULL)
+                    result = apr_table_get(r->subprocess_env, var+4);
+            }
             if (result == NULL)
                 result = getenv(var+4);
         }