cpw.malu.xmpp.jingle_ft: 43588c0e: Don't crash when canceling an S5B transf...
malu at pidgin.im
malu at pidgin.im
Mon Jan 18 16:36:43 EST 2010
-----------------------------------------------------------------
Revision: 43588c0e327fd7422dc526a6a958be2091741a91
Ancestor: 999b2917d280f0c89f01b7c9559a602afbdb4b54
Author: malu at pidgin.im
Date: 2010-01-18T21:31:39
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/43588c0e327fd7422dc526a6a958be2091741a91
Modified files:
libpurple/protocols/jabber/jingle/s5b.c
ChangeLog:
Don't crash when canceling an S5B transfer when it uses a proxy.
Plug a little leak, too
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c de384f3aa315c322f88d5eab0da1a1b13d0b7b6b
+++ libpurple/protocols/jabber/jingle/s5b.c a1f198a62657fc6bce9e0274065ce2dc09403acb
@@ -1373,6 +1373,14 @@ jingle_s5b_proxy_connect_cb(gpointer dat
JingleS5B *s5b = ((JingleS5BConnectData *) data)->s5b;
purple_debug_info("jingle-s5b", "connect to bytestreams proxy\n");
+ s5b->priv->connect_data = NULL;
+
+ /* destroy proxy info */
+ if (s5b->priv->ppi) {
+ purple_proxy_info_destroy(s5b->priv->ppi);
+ s5b->priv->ppi = NULL;
+ }
+
/* cancel timeout if set */
if (s5b->priv->connect_timeout) {
purple_timeout_remove(s5b->priv->connect_timeout);
More information about the Commits
mailing list