Changeset 20e830b

Timestamp:

2009-11-19T14:58:30Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

08e5bb2

Parents:

76c85b4c

Message:

Fixed a facepalm kind of NULL pointer dereference bug.

File:

• protocols/jabber/jabber_util.c (modified) (3 diffs)

protocols/jabber/jabber_util.c

@@ -463 +463 @@
                 
                 head = g_hash_table_lookup( jd->buddies, jid );
-                bud = head->next ? head->next : head;
+                bud = ( head && head->next ) ? head->next : head;
                 
                 g_free( jid );
@@ -546 +546 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *head, *bud, *prev, *bi;
+        struct jabber_buddy *bud, *prev, *bi;
         char *s, *full_jid;
         
@@ -554 +554 @@
                 *s = 0;
         
-        if( ( head = g_hash_table_lookup( jd->buddies, full_jid ) ) )
-        {
-                bud = head->next ? head->next : head;
+        if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
+        {
+                if( bud->next )
+                        bud = bud->next;
                 
                 /* If there's only one item in the list (and if the resource