From eed2b28c05201aea858a67394caa03e0fcff3bcb Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 20 Jan 2003 19:03:56 +0000 Subject: merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/hashtab.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'libiberty') diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3b236b0..e8f0ce2 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2003-01-20 Josef Zlomek + + * hashtab.c (htab_expand): Fix allocation of new entries. + 2003-01-09 Christian Cornelssen * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c index 6bf59ff..27741ef 100644 --- a/libiberty/hashtab.c +++ b/libiberty/hashtab.c @@ -306,16 +306,18 @@ htab_expand (htab) PTR *olimit; PTR *p; PTR *nentries; + size_t nsize; oentries = htab->entries; olimit = oentries + htab->size; - htab->size = higher_prime_number (htab->size * 2); + nsize = higher_prime_number (htab->size * 2); - nentries = (PTR *) (*htab->alloc_f) (htab->size, sizeof (PTR *)); + nentries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR)); if (nentries == NULL) return 0; htab->entries = nentries; + htab->size = nsize; htab->n_elements -= htab->n_deleted; htab->n_deleted = 0; -- cgit v1.1