Changeset 2379566

Timestamp:

2007-12-19T00:22:30Z (17 years ago)

Author:

kenobi <kenobi@…>

Branches:

master

Children:

0fbd3a6d

Parents:

eded1f7 (diff), de03374 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged:

Wilmer van der Gaast 2007-12-04 Fixing jabber_login/_logout for better (non-crashing) cleanup on early

File:

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

protocols/jabber/jabber.c

@@ -76 +76 @@
         jd->username = g_strdup( acc->user );
         jd->server = strchr( jd->username, '@' );
+        
+        jd->fd = jd->r_inpa = jd->w_inpa = -1;
         
         if( jd->server == NULL )
@@ -232 +234 @@
         struct jabber_data *jd = ic->proto_data;
         
-        jabber_end_stream( ic );
+        if( jd->fd >= 0 )
+                jabber_end_stream( ic );
         
         while( ic->groupchats )
@@ -250 +253 @@
                 g_free( jd->txq );
         
-        g_hash_table_destroy( jd->node_cache );
+        if( jd->node_cache )
+                g_hash_table_destroy( jd->node_cache );
         
         xt_free( jd->xt );