pidgin: e9025a61: Fix a couple of possible null-pointer de...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e9025a61100e97343434ea5e55b20ee996f0f26b
Ancestor: 036f23672a0a8337667b44f4736d9263ca5937a6
Author: sadrul at pidgin.im
Date: 2009-09-26T17:34:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e9025a61100e97343434ea5e55b20ee996f0f26b

Modified files:
        libpurple/protocols/yahoo/yahoo_filexfer.c

ChangeLog: 

Fix a couple of possible null-pointer dereferences.

Thanks to clang-analyzer (http://clang-analyzer.llvm.org/)

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c	9847f1ca4caf96df6df2a215310eca27d075b059
+++ libpurple/protocols/yahoo/yahoo_filexfer.c	c3c91a52dc688dfc688bc76df861a334758f1337
@@ -1363,7 +1363,6 @@ static void yahoo_p2p_ft_POST_cb(gpointe
 
 	xfer = data;
 	if (!(xd = xfer->data))	{
-		purple_input_remove(xd->input_event);
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
@@ -1387,7 +1386,6 @@ static void yahoo_p2p_ft_HEAD_GET_cb(gpo
 
 	xfer = data;
 	if (!(xd = xfer->data))	{
-		purple_input_remove(xd->input_event);
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
@@ -1491,7 +1489,7 @@ static void yahoo_p2p_ft_server_listen_c
 	char *filename_without_spaces = NULL;
 
 	xfer = data;
-	if ( !( (xd = xfer->data) || (listenfd != -1) ) )	{
+	if (!(xd = xfer->data) || (listenfd == -1))	{
 		purple_debug_warning("yahoo","p2p: error starting server for p2p file transfer\n");
 		purple_xfer_cancel_remote(xfer);
 		return;