Changeset 9bcbe48 for protocols

Timestamp:

2006-11-23T09:34:18Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

25984f2

Parents:

16b5f86

Message:

Fixed some (possible) NULL-pointer dereferences. THANKS FOR NOTHING to
GLib for giving this very useful "s2 != NULL assertion failed" message
instead of just dereferencing the damn pointer so I can find a backtrace,
this sure makes debugging very easy, guys! Wasn't GLib supposed to SAVE
time?

File:

• protocols/jabber/iq.c (modified) (8 diffs)

protocols/jabber/iq.c

@@ -51 +51 @@
                     strncmp( s, JABBER_CACHED_ID, strlen( JABBER_CACHED_ID ) ) != 0 )
                 {
-                        /* Silently ignore it, without an ID (or an non-cache
+                        /* Silently ignore it, without an ID (or a non-cache
                            ID) we don't know how to handle the packet and we
                            probably don't have to. */
@@ -60 +60 @@
                 
                 if( entry == NULL )
-                        serv_got_crap( gc, "WARNING: Received IQ %s packet with unknown/expired ID %s!", type, s );
+                        serv_got_crap( gc, "WARNING: Received IQ-%s packet with unknown/expired ID %s!", type, s );
                 else if( entry->func )
                         return entry->func( gc, node, entry->node );
@@ -136 +136 @@
                 }
                 
+                /* This is a roster push. XMPP servers send this when someone
+                   was added to (or removed from) the buddy list. AFAIK they're
+                   sent even if we added this buddy in our own session. */
                 if( strcmp( s, XMLNS_ROSTER ) == 0 )
                 {
@@ -151 +154 @@
                         else
                         {
-                                serv_got_crap( gc, "WARNING: %s tried to fake a roster push!", s );
+                                serv_got_crap( gc, "WARNING: %s tried to fake a roster push!", s ? s : "(unknown)" );
                                 
                                 xt_free_node( reply );
@@ -214 +217 @@
         char *s;
         
-        query = xt_find_node( node->children, "query" );
+        if( !( query = xt_find_node( node->children, "query" ) ) )
+        {
+                serv_got_crap( gc, "WARNING: Received incomplete IQ packet while authenticating" );
+                signoff( gc );
+                return XT_HANDLED;
+        }
         
         /* Time to authenticate ourselves! */
@@ -264 +272 @@
 static xt_status jabber_finish_iq_auth( struct gaim_connection *gc, struct xt_node *node, struct xt_node *orig )
 {
-        char *type = xt_find_attr( node, "type" );
         struct jabber_data *jd = gc->proto_data;
+        char *type;
+        
+        if( !( type = xt_find_attr( node, "type" ) ) )
+        {
+                serv_got_crap( gc, "WARNING: Received incomplete IQ packet while authenticating" );
+                signoff( gc );
+                return XT_HANDLED;
+        }
         
         if( strcmp( type, "error" ) == 0 )
@@ -336 +351 @@
         int initial = ( orig != NULL );
         
-        query = xt_find_node( node->children, "query" );
+        if( !( query = xt_find_node( node->children, "query" ) ) )
+        {
+                serv_got_crap( gc, "WARNING: Received NULL roster packet" );
+                return XT_HANDLED;
+        }
         
         c = query->children;
@@ -361 +380 @@
                                 if( find_buddy( gc, jid ) == NULL )
                                         add_buddy( gc, NULL, jid, name );
-                                else
+                                else if( name )
                                         serv_buddy_rename( gc, jid, name );
                         }