diff options
| author | kenobi <kenobi@rhea> | 2007-12-19 01:22:30 +0100 |
|---|---|---|
| committer | kenobi <kenobi@rhea> | 2007-12-19 01:22:30 +0100 |
| commit | 2379566b07de55bd0f59503c39ba253ce2556877 (patch) | |
| tree | 7a731363cfd014eb59ce65734c52cbc3d46b1b73 | |
| parent | eded1f703a8f5d2272b9d294d8e3dfb48fa302b4 (diff) | |
| parent | de0337481fca3894c406a2724da30af8cc8bae2f (diff) | |
merged:
Wilmer van der Gaast 2007-12-04 Fixing jabber_login/_logout for better (non-crashing) cleanup on early
| -rw-r--r-- | protocols/jabber/jabber.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 1d3225dd..d028655a 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -76,6 +76,8 @@ static void jabber_login( account_t *acc ) jd->username = g_strdup( acc->user ); jd->server = strchr( jd->username, '@' ); + jd->fd = jd->r_inpa = jd->w_inpa = -1; + if( jd->server == NULL ) { imcb_error( ic, "Incomplete account name (format it like <username@jabberserver.name>)" ); @@ -231,7 +233,8 @@ static void jabber_logout( struct im_connection *ic ) { struct jabber_data *jd = ic->proto_data; - jabber_end_stream( ic ); + if( jd->fd >= 0 ) + jabber_end_stream( ic ); while( ic->groupchats ) jabber_chat_free( ic->groupchats ); @@ -249,7 +252,8 @@ static void jabber_logout( struct im_connection *ic ) if( jd->tx_len ) 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 ); |