From: Graham Leggett <minfrin@apache.org>
Date: Sun, 13 Sep 2009 14:59:28 +0000 (+0000)
Subject: mod_session.c: Prevent a segfault when session is added but not
X-Git-Tag: 2.3.3~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b890238ef4a1c1baabc927e0ea3aac0d4aa5027f;p=apache

mod_session.c: Prevent a segfault when session is added but not
configured.


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

diff --git a/CHANGES b/CHANGES
index 05b7cd68bd..fcf3ac7561 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.3
 
+  *) mod_session.c: Prevent a segfault when session is added but not
+     configured. [Graham Leggett]
+
   *) htcacheclean: 19 ways to fail, 1 error message. Fixed. [Graham Leggett]
 
   *) mod_auth_digest: Fail server start when nonce count checking
diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
index 49af22b450..fa56b36831 100644
--- a/modules/session/mod_session.c
+++ b/modules/session/mod_session.c
@@ -99,7 +99,7 @@ static int ap_session_load(request_rec * r, session_rec ** z)
     int rv = 0;
 
     /* is the session enabled? */
-    if (!dconf->enabled) {
+    if (!dconf || !dconf->enabled) {
         return APR_SUCCESS;
     }