]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
fix another null pointer dereference found by clang
authorStefan Fritsch <sf@apache.org>
Mon, 27 Sep 2010 14:34:29 +0000 (14:34 +0000)
committerStefan Fritsch <sf@apache.org>
Mon, 27 Sep 2010 14:34:29 +0000 (14:34 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1001757 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_vars.c

index 2b14198c21818b26139c94144bdf207171d9c97c..c05ed06403ca3a73679c731ee2f6452aab56e93f 100644 (file)
@@ -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);
         }