# HG changeset patch # User Evan Schoenberg # Date 1163356465 0 # Node ID 8a564904e9b505f2587d60e84d548841ac362df0 # Parent 91d8fb14bd27f19904920405802e1ea3ac3715e9 [gaim-migrate @ 17740] As with jabber_recv_cb_ssl(), jabber_login_callback_ssl() needs to either be cancelled properly or check to ensure its GaimConnection is valid when it is triggered. Since the former is not done yet, I've added the latter, with the same TODO comment as is present in jabber_recv_cb_ssl(). committer: Tailor Script diff -r 91d8fb14bd27 -r 8a564904e9b5 libgaim/protocols/jabber/jabber.c --- a/libgaim/protocols/jabber/jabber.c Sat Nov 11 23:35:07 2006 +0000 +++ b/libgaim/protocols/jabber/jabber.c Sun Nov 12 18:34:25 2006 +0000 @@ -430,7 +430,15 @@ GaimInputCondition cond) { GaimConnection *gc = data; - JabberStream *js = gc->proto_data; + JabberStream *js; + + /* TODO: It should be possible to make this check unnecessary */ + if(!GAIM_CONNECTION_IS_VALID(gc)) { + gaim_ssl_close(gsc); + return; + } + + js = gc->proto_data; if(js->state == JABBER_STREAM_CONNECTING) jabber_send_raw(js, "", -1);