Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

[gaim-migrate @ 17902]

Wed, 06 Dec 2006 18:04:20 +0000

author

Mark Doliner <markdoliner@pidgin.im>

date

Wed, 06 Dec 2006 18:04:20 +0000

changeset 15178

eabb35896e1a

parent 15177

8b6c66e09388

child 15179

0085b146bf0d

[gaim-migrate @ 17902]
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).

--- a/libgaim/protocols/oscar/peer.c	Wed Dec 06 07:24:41 2006 +0000
+++ b/libgaim/protocols/oscar/peer.c	Wed Dec 06 18:04:20 2006 +0000
@@ -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;
 	}