# HG changeset patch # User hansmi # Date 1173130989 28800 # Node ID 65543c999c7e4764f7f1f005442fe216c6471586 # Parent 7c19bb5516dbd1c1eb7c6c77ea000b225acc8147 [svn] Check filesize before doing memcmp (potential sigsegv). diff -r 7c19bb5516db -r 65543c999c7e ChangeLog --- a/ChangeLog Sun Mar 04 10:43:38 2007 -0800 +++ b/ChangeLog Mon Mar 05 13:43:09 2007 -0800 @@ -1,3 +1,12 @@ +2007-03-04 18:43:38 +0000 Michael Farber <01mf02@gmail.com> + revision [4222] + - Removed some of the horrible code duplication in the file popup code + + + trunk/src/audacious/ui_fileinfopopup.c | 593 +++++++++++++++------------------ + 1 file changed, 271 insertions(+), 322 deletions(-) + + 2007-03-04 06:34:27 +0000 William Pitcock revision [4220] - fix handling of multiple files on the command line. diff -r 7c19bb5516db -r 65543c999c7e src/audacious/build_stamp.c --- a/src/audacious/build_stamp.c Sun Mar 04 10:43:38 2007 -0800 +++ b/src/audacious/build_stamp.c Mon Mar 05 13:43:09 2007 -0800 @@ -1,2 +1,2 @@ #include -const gchar *svn_stamp = "20070304-4220"; +const gchar *svn_stamp = "20070304-4222"; diff -r 7c19bb5516db -r 65543c999c7e src/audacious/util.c --- a/src/audacious/util.c Sun Mar 04 10:43:38 2007 -0800 +++ b/src/audacious/util.c Mon Mar 05 13:43:09 2007 -0800 @@ -420,7 +420,7 @@ * by incomp@#audacious. Cleanups \nenolod * FIXME: can't we use a GLib function for that? -- 01mf02 */ - if (!memcmp(&buffer[0],&x,2)) + if (filesize > 2 && !memcmp(&buffer[0],&x,2)) { gchar *outbuf = g_malloc (filesize); /* it's safe to waste memory. */ guint counter;