From c64021f87d770e1e1ad8e62dd3be308bf05e7c53 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sat, 18 Feb 2006 20:48:09 +0000 Subject: gst/id3demux/: Handle 0 data size in otherwise valid frames. Original commit message from CVS: * gst/id3demux/id3tags.c: (id3demux_id3v2_frames_to_tag_list): * gst/id3demux/id3v2frames.c: (id3v2_genre_fields_to_taglist): Handle 0 data size in otherwise valid frames. Handle numeric strings in 2.4.0 even when not in parentheses --- gst/id3demux/id3v2frames.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gst/id3demux/id3v2frames.c') diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c index cf356433..bab609de 100644 --- a/gst/id3demux/id3v2frames.c +++ b/gst/id3demux/id3v2frames.c @@ -420,7 +420,9 @@ id3v2_genre_fields_to_taglist (ID3TagsWorking * work, const gchar * tag_name, continue; len = strlen (tag_str); - if (work->hdr.version <= 0x300) { /* <= 2.3.0 */ + /* Only supposed to see '(n)' type numeric genre strings in ID3 <= 2.3.0 + * but apparently we see them in 2.4.0 sometimes too */ + if (TRUE || work->hdr.version <= 0x300) { /* <= 2.3.0 */ /* Check for genre numbers wrapped in parentheses, possibly * followed by a string */ while (len >= 2) { -- cgit