aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-01-28 20:04:49 +0000
committerUlrich Drepper <drepper@redhat.com>2009-01-28 20:04:49 +0000
commit5627534a81943eb4317651bb8d2daa6d93accd25 (patch)
treee405dc10045d6787498ae00e1de3f3739eab6ec1
parenta7bd183ffe1bd3c8d68e832cfb6f4c3df76d52f1 (diff)
downloadglibc-5627534a81943eb4317651bb8d2daa6d93accd25.zip
glibc-5627534a81943eb4317651bb8d2daa6d93accd25.tar.gz
glibc-5627534a81943eb4317651bb8d2daa6d93accd25.tar.bz2
[BZ #9741]
2009-01-28 Ulrich Drepper <drepper@redhat.com> [BZ #9741] * nscd/mem.c (gc): Fix assignment of he_data in case malloc is used. Reported by Jun'ichi Nomura <j-nomura@ce.jp.nec.com>.
-rw-r--r--ChangeLog6
-rw-r--r--nscd/mem.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cbcb3b7..df49905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-28 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #9741]
+ * nscd/mem.c (gc): Fix assignment of he_data in case malloc is used.
+ Reported by Jun'ichi Nomura <j-nomura@ce.jp.nec.com>.
+
2009-01-14 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sysdep.h (INTERNAL_SYSCALL):
diff --git a/nscd/mem.c b/nscd/mem.c
index e821729..5f4c4dd 100644
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -1,5 +1,5 @@
/* Cache memory handling.
- Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
@@ -163,7 +163,7 @@ gc (struct database_dyn *db)
else
{
he = xmalloc (memory_needed);
- he_data = &he[db->head->nentries * sizeof (struct hashentry *)];
+ he_data = &he[db->head->nentries];
he_use_malloc = true;
}