* nscd/connections.c (verify_persistent_db): Recognize circular lists.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 65c96fe..24ca28f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-10-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/nscd_helper.c (__nscd_cache_search): Prevent endless loops.
+	* nscd/connections.c (verify_persistent_db): Recognize circular lists.
 
 	[BZ #4407]
 	* sysdeps/ieee754/dbl-64/e_lgamma_r.c: Fix *signgamp for -0.0.
diff --git a/nscd/connections.c b/nscd/connections.c
index 0687a26..2572a42 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -378,7 +378,8 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
   nscd_ssize_t he_cnt = 0;
   for (nscd_ssize_t cnt = 0; cnt < head->module; ++cnt)
     {
-      ref_t work = head->array[cnt];
+      ref_t first = head->array[cnt];
+      ref_t work = first;
 
       while (work != ENDREF)
 	{
@@ -437,6 +438,10 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
 	    }
 
 	  work = here->next;
+
+	  if (work == first)
+	    /* A circular list, this must not happen.  */
+	    goto fail;
 	}
     }