Changeset 842cd8d

Timestamp:

2010-03-18T11:22:17Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

638feab

Parents:

00a0bc5

Message:

Fixed a bug that caused full JIDs to get lost sometimes with the new way
of storing full JIDs belongong to a contact.

Files:

• protocols/jabber/jabber_util.c (modified) (5 diffs)
• tests/check_jabber_util.c (modified) (1 diff)

protocols/jabber/jabber_util.c

@@ -4 +4 @@
 *  Jabber module - Misc. stuff                                              *
 *                                                                           *
-*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*  Copyright 2006-2010 Wilmer van der Gaast <wilmer@gaast.net>              
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -556 +556 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud, *prev, *bi;
+        struct jabber_buddy *bud, *prev = NULL, *bi;
         char *s, *full_jid;
         
@@ -567 +567 @@
         {
                 if( bud->next )
-                        bud = bud->next;
+                        bud = (prev=bud)->next;
                 
                 /* If there's only one item in the list (and if the resource
@@ -587 +587 @@
                 else
                 {
-                        for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next )
+                        for( bi = bud; bi; bi = (prev=bi)->next )
                                 if( strcmp( bi->resource, s + 1 ) == 0 )
                                         break;
@@ -598 +598 @@
                                         prev->next = bi->next;
                                 else
-                                        /* The hash table should point at the second
-                                           item, because we're removing the first. */
+                                        /* Don't think this should ever happen anymore. */
                                         g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next );
                                 

tests/check_jabber_util.c

@@ -84 +84 @@
         fail_unless( jabber_buddy_remove( ic, "nekkid@lamejab.net" ) );
         fail_if( jabber_buddy_by_jid( ic, "nekkid@lamejab.net", 0 ) );
+        
+        /* Fixing a bug in this branch that caused information to get lost when
+           removing the first full JID from a list. */
+        jabber_buddy_add( ic, "bugtest@google.com/A" );
+        jabber_buddy_add( ic, "bugtest@google.com/B" );
+        jabber_buddy_add( ic, "bugtest@google.com/C" );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/A" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/B" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/C" ) );
 }