[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.320.2.5,1.320.2.6

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30906/src/protocols/msn

Modified Files:
      Tag: oldstatus
	msn.c 
Log Message:
This fixes a crash trying to send a file on MSN if you can't actually read the
file you're trying to send.
Someone reported this in #gaim, I hope it fixes some bugs in the tracker too.



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.320.2.5
retrieving revision 1.320.2.6
diff -u -d -p -r1.320.2.5 -r1.320.2.6
--- msn.c	13 Oct 2004 17:53:20 -0000	1.320.2.5
+++ msn.c	15 Oct 2004 18:43:33 -0000	1.320.2.6
@@ -348,9 +348,34 @@ static void
 t_msn_xfer_init(GaimXfer *xfer)
 {
 	MsnSlpLink *slplink;
+	const char *filename;
+	FILE *fp;
+
+	filename = gaim_xfer_get_local_filename(xfer);
 
 	slplink = xfer->data;
 
+	if ((fp = fopen(filename, "rb")) == NULL)
+	{
+		GaimAccount *account;
+		GaimConnection *gc;
+		const char *who;
+		char *msg;
+
+		account = slplink->session->account;
+		gc = gaim_account_get_connection(account);
+		who = slplink->remote_user;
+
+		msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
+							  filename, strerror(errno));
+		gaim_xfer_error(gaim_xfer_get_type(xfer), who, msg);
+		gaim_xfer_cancel_local(xfer);
+		g_free(msg);
+
+		return;
+	}
+	fclose(fp);
+
 	msn_slplink_request_ft(slplink, xfer);
 }