From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 22 Jul 2001 21:48:51 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~15833
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61c037249fe1e2bb62e596d47bd49e3b30e5ca32;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

2001-07-22  Ulrich Drepper  <drepper@redhat.com>

	* iconv/strtab.c (morememory): Fix little memory handling problem.
---

diff --git a/ChangeLog b/ChangeLog
index 32e12ac..f0bd8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-22  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/strtab.c (morememory): Fix little memory handling problem.
+
 2001-07-22  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/unix/sysv/linux/m68k/sysdep.h (INLINE_SYSCALL): Don't
diff --git a/iconv/strtab.c b/iconv/strtab.c
index 5b3e328..be79dc2 100644
--- a/iconv/strtab.c
+++ b/iconv/strtab.c
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <inttypes.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -72,7 +73,7 @@ strtabinit (void)
 {
   if (ps == 0)
     {
-      ps = sysconf (_SC_PAGESIZE) - 2 * sizeof (void);
+      ps = sysconf (_SC_PAGESIZE) - 2 * sizeof (void *);
       assert (sizeof (struct memoryblock) < ps);
     }
 
@@ -94,7 +95,7 @@ morememory (struct Strtab *st, size_t len)
   newmem->next = st->memory;
   st->memory = newmem;
   st->backp = newmem->memory;
-  st->left = len;
+  st->left = len - offsetof (struct memoryblock, memory);
 }