pidgin: 3abad760: Swap two lines to fix a crash.

sadrul at pidgin.im sadrul at pidgin.im
Mon Oct 12 04:26:02 EDT 2009


-----------------------------------------------------------------
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3abad7606f4a2dfd1903df796f33924b12509a56

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog: 

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/servconn.c	80d4f276f107098c40472d51670f6785a20178fb
+++ libpurple/protocols/msn/servconn.c	1df0225b419679610dd807ce9daf4feb92405919
@@ -299,8 +299,8 @@ servconn_idle_timeout_cb(MsnServConn *se
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
+	servconn->timeout_handle = 0;
 	msn_servconn_disconnect(servconn);
-	servconn->timeout_handle = 0;	/* XXX: servconn may not be valid anymore */
 	return FALSE;
 }
 


More information about the Commits mailing list