This patch includes (1) a rewrite of hash_delete_hash, and (2) some

changes to the IMAP code that Thomas Glanzmann made during an
attempt to squash some segmentation fault in May.  There is no
guarantee that this patch doesn't break things.  If it does, please
complain to mutt-dev.

1 files changed, 12 insertions, 8 deletions

diff --git a/hash.c b/hash.c
index 01eaad70..a4c72916 100644
--- a/hash.c
+++ b/hash.c
@@ -117,18 +117,22 @@ void hash_delete_hash (HASH * table, int hash, const char *key, const void *data
   struct hash_elem *ptr = table->table[hash];
   struct hash_elem **last = &table->table[hash];
 
-  for (; ptr; last = &ptr->next, ptr = ptr->next)
+  while (ptr) 
   {
-    /* if `data' is given, look for a matching ->data member.  this is
-     * required for the case where we have multiple entries with the same
-     * key
-     */
-    if ((data == ptr->data) || (!data && mutt_strcmp (ptr->key, key) == 0))
+    if ((data == ptr->data || !data)
+	&& mutt_strcmp (ptr->key, key) == 0)
     {
       *last = ptr->next;
-      if (destroy) destroy (ptr->data);
+      if (destroy)
+	destroy (ptr->data);
       FREE (&ptr);
-      return;
+      
+      ptr = *last;
+    }
+    else
+    {
+      last = &ptr->next;
+      ptr = ptr->next;
     }
   }
 }