[Gaim-commits] SF.net SVN: gaim: [17740] trunk/libgaim/protocols/jabber/jabber.c

[<ev...@us...>]

Revision: 17740
          http://svn.sourceforge.net/gaim/?rev=17740&view=rev
Author:   evands
Date:     2006-11-12 10:34:25 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
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().

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/jabber.c

Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	2006-11-11 23:35:07 UTC (rev 17739)
+++ trunk/libgaim/protocols/jabber/jabber.c	2006-11-12 18:34:25 UTC (rev 17740)
@@ -430,8 +430,16 @@
 		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, "<?xml version='1.0' ?>", -1);
 	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.