Crashbug fix in new MSN Passport code (plus a fix to make the 005 reply actually work).

2 files changed, 3 insertions, 3 deletions

diff --git a/irc.c b/irc.c
index 61d78bc9..cd84e3ca 100644
--- a/irc.c
+++ b/irc.c
@@ -1075,7 +1075,7 @@ void irc_login( irc_t *irc )
 	irc_reply( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->myhost );
 	irc_reply( irc,   3, ":%s", IRCD_INFO );
 	irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES, CMODES );
-	irc_reply( irc,   5, "PREFIX=(ov)@% CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
+	irc_reply( irc,   5, "PREFIX=(ov)@%% CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
 	irc_motd( irc );
 	irc_umode_set( irc, irc->myhost, "+" UMODE );
 
diff --git a/protocols/msn/passport.c b/protocols/msn/passport.c
index e04d14cb..34703432 100644
--- a/protocols/msn/passport.c
+++ b/protocols/msn/passport.c
@@ -87,7 +87,7 @@ static void passport_get_id_ready( struct http_request *req )
 {
 	struct passport_reply *rep = req->data;
 	
-	if( !g_slist_find( msn_connections, rep->data ) )
+	if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
 	{
 		destroy_reply( rep );
 		return;
@@ -168,7 +168,7 @@ static void passport_retrieve_dalogin_ready( struct http_request *req )
 	char *dalogin;
 	char *urlend;
 	
-	if( !g_slist_find( msn_connections, rep->data ) )
+	if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
 	{
 		destroy_reply( rep );
 		return;