[Gaim-commits] SF.net SVN: gaim: [17902] trunk/libgaim/protocols/oscar/peer.c

[<the...@us...>]

Revision: 17902
          http://svn.sourceforge.net/gaim/?rev=17902&view=rev
Author:   thekingant
Date:     2006-12-06 10:04:20 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
I tested my changes from yesterday and they caused uns crashy boom.
We were trying to free some proxy_connect_data but it had already
been set to NULL (because one of the two parallel connections
failed immediately, and the second one succeeded).

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/peer.c

Modified: trunk/libgaim/protocols/oscar/peer.c
===================================================================
--- trunk/libgaim/protocols/oscar/peer.c	2006-12-06 07:24:41 UTC (rev 17901)
+++ trunk/libgaim/protocols/oscar/peer.c	2006-12-06 18:04:20 UTC (rev 17902)
@@ -528,10 +528,14 @@
 	gaim_timeout_remove(conn->connect_timeout_timer);
 	conn->connect_timeout_timer = 0;
 
-	if (verified) {
+	if (conn->client_connect_data != NULL)
+	{
 		gaim_proxy_connect_cancel(conn->client_connect_data);
 		conn->client_connect_data = NULL;
-	} else {
+	}
+
+	if (conn->verified_connect_data != NULL)
+	{
 		gaim_proxy_connect_cancel(conn->verified_connect_data);
 		conn->verified_connect_data = NULL;
 	}


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