From: Ulrich Drepper <drepper@gmail.com>
Date: Tue, 19 Jul 2011 17:59:57 +0000 (-0400)
Subject: Avoid possible crashes in anormal nscd exits
X-Git-Tag: glibc-2.15~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feb1eb0be78b40d53c71474f07d1b0517ba95586;p=thirdparty%2Fglibc.git

Avoid possible crashes in anormal nscd exits
---

diff --git a/ChangeLog b/ChangeLog
index 3de90108af3..b6cc5ca942f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-19  Ulrich Drepper  <drepper@gmail.com>
+
+	* nscd/nscd.c (termination_handler): Don't do anything for a database
+	if it has not yet been initialized.
+
 2011-07-18  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/bits/sched.h (__CPU_EQUAL_S): Fix a typo.
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 4894cb2faa6..e9bb75d3e94 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -493,7 +493,7 @@ termination_handler (int signum)
   /* Synchronize memory.  */
   for (int cnt = 0; cnt < lastdb; ++cnt)
     {
-      if (!dbs[cnt].enabled)
+      if (!dbs[cnt].enabled || dbs[cnt].head == NULL)
 	continue;
 
       /* Make sure nobody keeps using the database.  */