From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 18 May 2008 02:45:46 +0000 (+0000)
Subject: * nscd/mem.c (gc): Fix test for stack overuse.
X-Git-Tag: cvs/fedora-glibc-20080518T1017~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b21595750e4feda0c0478579070d98f41b4f845f;p=thirdparty%2Fglibc.git

* nscd/mem.c (gc): Fix test for stack overuse.
---

diff --git a/ChangeLog b/ChangeLog
index 4333d1c7692..315b472b890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-17  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/mem.c (gc): Fix test for stack overuse.
+
 	* nscd/aicache.c (addhstaiX): Fix a few small problems, cleanups,
 	more asserts.
 
diff --git a/nscd/mem.c b/nscd/mem.c
index 14928d633ca..21f2ae821dc 100644
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -132,12 +132,12 @@ gc (struct database_dyn *db)
     stack_used = 0;
   size_t memory_needed = ((db->head->first_free / BLOCK_ALIGN + BITS - 1)
 			  / BITS) * sizeof (BITMAP_T);
-  if (memory_needed <= MAX_STACK_USE)
+  if (stack_used + memory_needed <= MAX_STACK_USE)
     {
       mark = (BITMAP_T *) alloca (memory_needed);
       mark_use_malloc = false;
       memset (mark, '\0', memory_needed);
-      stack_used = memory_needed;
+      stack_used += memory_needed;
     }
   else
     {