From db4d7a313e10d085218a95f9176b12287a300d7c Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sun, 31 Jan 2010 11:43:42 +0000 Subject: 1st part of fix for FS#10637. Correction of mpc header parsing. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24408 a1c6a512-1295-4272-9138-f99709370657 --- apps/metadata/mpc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/metadata/mpc.c') diff --git a/apps/metadata/mpc.c b/apps/metadata/mpc.c index e20ac3e8a2..3f8907a934 100644 --- a/apps/metadata/mpc.c +++ b/apps/metadata/mpc.c @@ -66,9 +66,7 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3) header[0] = letoh32(header[0]); streamversion = (header[0] >> 24) & 15; - if (streamversion >= 8) { - return false; /* SV8 or higher don't exist yet, so no support */ - } else if (streamversion == 7) { + if (streamversion == 7) { unsigned int gapless = (header[5] >> 31) & 0x0001; unsigned int last_frame_samples = (header[5] >> 20) & 0x07ff; unsigned int bufused = 0; @@ -82,7 +80,11 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3) bufused = set_replaygain(id3, false, header[3], bufused); bufused = set_replaygain(id3, true, header[4], bufused); + } else { + return false; /* only SV7 is allowed within a "MP+" signature */ } + } else if (!memcmp(header, "MPCK", 4)) { /* Compare to sig "MPCK" */ + return false; /* SV8 is not supported yet */ } else { return false; /* SV4-6 is not supported anymore */ } -- cgit v1.2.3