# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1123809135 0
# Node ID 04fd99debeb9a40058059f48664ccc15f74ca151
# Parent  237d65590d2b1aa3c43572d3fff70d40c7bf285e
[gaim-migrate @ 13389]
Fix a potential crash with some versions of gtk on some systems when
someone sends you a file with a name with non-good characters

committer: Tailor Script <tailor@pidgin.im>

diff -r 237d65590d2b -r 04fd99debeb9 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Fri Aug 12 01:08:32 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Aug 12 01:12:15 2005 +0000
@@ -3617,7 +3617,18 @@
 			xfer = gaim_xfer_new(gc->account, GAIM_XFER_RECEIVE, userinfo->sn);
 			xfer->remote_ip = g_strdup(args->verifiedip);
 			xfer->remote_port = args->port;
-			gaim_xfer_set_filename(xfer, args->info.sendfile.filename);
+
+			if (g_utf8_validate(args->info.sendfile.filename, -1,
+						NULL)) {
+				gaim_xfer_set_filename(xfer,
+						args->info.sendfile.filename);
+			} else {
+				gchar * utf8_filename = gaim_utf8_salvage(
+						args->info.sendfile.filename);
+				gaim_xfer_set_filename(xfer, utf8_filename);
+				g_free(utf8_filename);
+			}
+
 			gaim_xfer_set_size(xfer, args->info.sendfile.totsize);
 			
 			/* Ignore <ICQ_COOL_FT> XML that is sent along with ICQ sendfile requests */