pidgin: cc1c38e6: Clear out the fd when we pass it off to ...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Tue Jul 21 02:50:48 EDT 2009


-----------------------------------------------------------------
Revision: cc1c38e65de5e260ddb2bf7ccca720025570ef47
Ancestor: 143b76f58d972c4684d6d833fd85b68501344d47
Author: darkrain42 at pidgin.im
Date: 2009-07-21T06:47:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cc1c38e65de5e260ddb2bf7ccca720025570ef47

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

Clear out the fd when we pass it off to the SSL subsystem

Prevents an invalid fd error when STARTTLS fails.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	c208d2e9faf039ac3e9b861563bf6802ac4036e6
+++ libpurple/protocols/jabber/jabber.c	c55d52e6c80dc9f34ce9731bd8f6b54387aae2b5
@@ -699,6 +699,8 @@ static void tls_init(JabberStream *js)
 	js->gc->inpa = 0;
 	js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
 			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc);
+	/* The fd is no longer our concern */
+	js->fd = -1;
 }
 
 static gboolean jabber_login_connect(JabberStream *js, const char *domain, const char *host, int port,


More information about the Commits mailing list