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 05b7cd68bdbb15e85ef4004a780cce6acd3f1349..fcf3ac75610ac51b96221212a349ab66538689e8 100644 (file)
--- 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 49af22b45081fd95d1eca7067ab7c353f5d4f4b6..fa56b368310de712c832af1658e4867f0e5f4869 100644 (file)
--- 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;
     }