X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_anyhash_list2.h;h=96b98e8825c45c0da5d4f761e1c63bcb8904410a;hb=c3de829c6f94be07b6104c5403d070791fc516fb;hp=eb8d6e9771028a8a2c2611601602d52f07483a81;hpb=0a51cf1590113188ff1dc78dc79d2924c262a865;p=gnulib.git

diff --git a/lib/gl_anyhash_list2.h b/lib/gl_anyhash_list2.h
index eb8d6e977..96b98e882 100644
--- a/lib/gl_anyhash_list2.h
+++ b/lib/gl_anyhash_list2.h
@@ -1,11 +1,11 @@
 /* Sequential list data type implemented by a hash table with another list.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Common code of
    gl_linkedhash_list.c, gl_avltreehash_list.c, gl_rbtreehash_list.c.  */
@@ -100,29 +99,40 @@ hash_resize (gl_list_t list, size_t estimate)
     {
       gl_hash_entry_t *old_table = list->table;
       /* Allocate the new table.  */
-      gl_hash_entry_t *new_table =
-	(gl_hash_entry_t *) xzalloc (new_size * sizeof (gl_hash_entry_t));
+      gl_hash_entry_t *new_table;
       size_t i;
 
+      if (size_overflow_p (xtimes (new_size, sizeof (gl_hash_entry_t))))
+        goto fail;
+      new_table =
+        (gl_hash_entry_t *) calloc (new_size, sizeof (gl_hash_entry_t));
+      if (new_table == NULL)
+        goto fail;
+
       /* Iterate through the entries of the old table.  */
       for (i = list->table_size; i > 0; )
-	{
-	  gl_hash_entry_t node = old_table[--i];
+        {
+          gl_hash_entry_t node = old_table[--i];
 
-	  while (node != NULL)
-	    {
-	      gl_hash_entry_t next = node->hash_next;
-	      /* Add the entry to the new table.  */
-	      size_t index = node->hashcode % new_size;
-	      node->hash_next = new_table[index];
-	      new_table[index] = node;
+          while (node != NULL)
+            {
+              gl_hash_entry_t next = node->hash_next;
+              /* Add the entry to the new table.  */
+              size_t bucket = node->hashcode % new_size;
+              node->hash_next = new_table[bucket];
+              new_table[bucket] = node;
 
-	      node = next;
-	    }
-	}
+              node = next;
+            }
+        }
 
       list->table = new_table;
       list->table_size = new_size;
       free (old_table);
     }
+  return;
+
+ fail:
+  /* Just continue without resizing the table.  */
+  return;
 }