Mercurial > pidgin.yaz
changeset 25994:c3c2e8b64539
Close a small race with disconnecting while establishing a connection and
a potential invalid use of a fd.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 15 Mar 2009 05:13:41 +0000 |
| parents | 71835e00c0fc |
| children | 6d7d360687bd |
| files | libpurple/protocols/jabber/bosh.c |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c Sun Mar 15 05:10:46 2009 +0000 +++ b/libpurple/protocols/jabber/bosh.c Sun Mar 15 05:13:41 2009 +0000 @@ -137,6 +137,8 @@ if (conn->fd >= 0) close(conn->fd); + purple_proxy_connect_cancel_with_handle(conn); + g_free(conn); } @@ -525,6 +527,7 @@ * with AIM! */ conn->ready = FALSE; + conn->fd = -1; if (conn->bosh->pipelining) /* Hmmmm, fall back to multiple connections */