From: Graham Leggett <minfrin@apache.org>
Date: Sat, 27 Apr 2013 21:32:55 +0000 (+0000)
Subject: mod_auth_digest: avoid crash if shm init fails.
X-Git-Tag: 2.4.5~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0379d363f85530b9f45ae50ff90b32ec298d75e8;p=apache

mod_auth_digest: avoid crash if shm init fails.

trunk patch: https://svn.apache.org/r1463047
Submitted by: sf
Reviewed by: humbedooh, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476676 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e6fd7d9632..8dd8a68e5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_auth_digest: Fix crashes if shm initialization failed. [Stefan
+     Fritsch]
+
   *) htpasswd, htdbm: Fix password generation. PR 54735. [Stefan Fritsch]
 
   *) core: Add workaround for gcc bug on sparc/64bit. PR 52900.
diff --git a/STATUS b/STATUS
index b88dda577b..2ad0357963 100644
--- a/STATUS
+++ b/STATUS
@@ -90,10 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_auth_digest: avoid crash if shm init fails.
-      trunk patches: https://svn.apache.org/r1463047
-      2.4.x patch: trunk patches work
-      +1: sf, humbedooh, covener
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 70703b9c5e..987e5b5b04 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -223,6 +223,8 @@ static apr_status_t cleanup_tables(void *not_used)
         opaque_lock = NULL;
     }
 
+    client_list = NULL;
+
     return APR_SUCCESS;
 }