Attachment 45235 Details for Bug 102961

[patch] One of the attchments

oscar_malformed_filename_crash_fix.patch (text/plain), 1.09 KB, created by Sebastian Krahmer on 2005-08-09 09:13:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2005-08-09 09:13:00 UTC

Size: 1.09 KB

patch

obsolete

>Index: src/protocols/oscar/oscar.c
>===================================================================
>RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
>retrieving revision 1.663.2.30
>diff -u -d -p -r1.663.2.30 oscar.c
>--- src/protocols/oscar/oscar.c	9 Jul 2005 21:48:21 -0000	1.663.2.30
>+++ src/protocols/oscar/oscar.c	15 Jul 2005 04:02:59 -0000
>@@ -3534,7 +3534,18 @@ static int incomingim_chan2(aim_session_
> 			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 */

Actions: View | Diff

Attachments on bug 102961: 45235 | 45236 | 45469 | 45470