Mercurial > pidgin.yaz

changeset 15117:2bec32a6f303

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 06 Dec 2006 18:04:20 +0000
parents 6cb9996fcc97
children 1f0db03dd165
files libgaim/protocols/oscar/peer.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}