Clear array before use.

	* nscd/hstcache.c (cache_addhst): Likewise.
	* nscd/grpcache.c (cache_addgr): Likewise.
	* nscd/servicescache.c (cache_addserv): Likewise.
	* nscd/pwdcache.c (cache_addpw): Likewise.
	* nscd/initgrcache.c (addinitgroupsX): Likewise.

diff --git a/ChangeLog b/ChangeLog
index cc33cef5c8a294be85f50180de0ccdfd8c334ee3..4a0fd89a388547920c458ed96f877e0ac19feda1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,10 +4,15 @@
        * nscd/mem.c (MAX_STACK_USE): Remove definition here.
        (gc): Initialize stack_used based on allocation in prune_cache.
        * nscd/cache.c (prune_cache): Use heap for mark array if necessary.
-       Clear array bfore use.
+       Clear array before use.
 
        * nscd/aicache.c (addhstaiX): Update statistics counter in case
        memory allocate failed.
+       * nscd/hstcache.c (cache_addhst): Likewise.
+       * nscd/grpcache.c (cache_addgr): Likewise.
+       * nscd/servicescache.c (cache_addserv): Likewise.
+       * nscd/pwdcache.c (cache_addpw): Likewise.
+       * nscd/initgrcache.c (addinitgroupsX): Likewise.
 
 2007-11-23  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 9cb6105f3cff35a07398096a496f03b1d2c0501b..002f04fb3e2b78d2600d45d2c16e1459821bc3a9 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -285,6 +285,8 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
                  dataset = memcpy (newp, dataset, total + n);
                  alloca_used = false;
                }
+             else
+               ++db->head->addfailed;
 
              /* Mark the old record as obsolete.  */
              dh->usable = false;

diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index c93691dcfde9d4ead61644866140f5aac8abd50a..cc041581e1027a3f29cb98661dc06b3c9900b2d3 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -325,6 +325,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
                      dataset = memcpy (newp, dataset, total + req->key_len);
                      alloca_used = false;
                    }
+                 else
+                   ++db->head->addfailed;
                }
 
              /* Mark the old record as obsolete.  */

diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index bb4ac37efc48683e7e2bf6d0b11968adb2cff5bf..157cd7860ca0d52c328ef2a61dfada4c11104864 100644 (file)
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -110,7 +110,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
   bool all_tryagain = true;
   bool any_success = false;
 
-  /* This is temporary memory, we need not (ad must not) call
+  /* This is temporary memory, we need not (and must not) call
      mempool_alloc.  */
   // XXX This really should use alloca.  need to change the backends.
   gid_t *groups = (gid_t *) malloc (size * sizeof (gid_t));
@@ -338,6 +338,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
                  dataset = memcpy (newp, dataset, total + req->key_len);
                  alloca_used = false;
                }
+             else
+               ++db->head->addfailed;
 
              /* Mark the old record as obsolete.  */
              dh->usable = false;

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 51ea113476bec6ecf00ac4ec9d82d913a485a9cd..bc1b6bab2f35b78ee94f4f80524fd7937a736f9b 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -280,6 +280,8 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
                  dataset = memcpy (newp, dataset, total + n);
                  alloca_used = false;
                }
+             else
+               ++db->head->addfailed;
 
              /* Mark the old record as obsolete.  */
              dh->usable = false;

diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index d6bf51d29fb81e21ed37937554150ecb7bf38b14..e122cb3f166f4596b1c0884603e55bf462729f33 100644 (file)
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -272,6 +272,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
                  dataset = memcpy (newp, dataset, total + req->key_len);
                  alloca_used = false;
                }
+             else
+               ++db->head->addfailed;
 
              /* Mark the old record as obsolete.  */
              dh->usable = false;