aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2005-11-29 01:43:15 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2005-11-29 01:43:15 +0100
commitc7cf9d6f811e299c3659350c6bd21c75ba249de5 (patch)
tree1a20b7809fdc99fb20025b22a64489f9489724f8
parentf712188c6240cb6f77791b4f05e55b1a001d4037 (diff)
This should fix a crash bug in Jabber module (NULL pointer dereference on broken Jabber/SSL connections).
-rw-r--r--protocols/jabber/jabber.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index d8d77a36..b6fca9b2 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -545,6 +545,11 @@ static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition c
struct jabber_data *jd;
gjconn gjc;
+ if (source == NULL) {
+ STATE_EVT(JCONN_STATE_OFF)
+ return;
+ }
+
if (!g_slist_find(get_connections(), gc)) {
ssl_disconnect(source);
return;
@@ -553,11 +558,6 @@ static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition c
jd = gc->proto_data;
gjc = jd->gjc;
- if (source == NULL) {
- STATE_EVT(JCONN_STATE_OFF)
- return;
- }
-
gjab_connected(data, gjc->fd, cond);
}