summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-03-30 01:50:32 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-03-30 01:54:40 +0100
commit9e1f5031ccda09da1b4e371850905adbac935956 (patch)
tree9dbedb84f5f790ababb47fcedb877ca0b84ec279
parentd756bab488f2f273442bf13b9c9c2f8c1bcb0def (diff)
id3demux: fix parsing of unsynced frames with data length indicator
Fixes bug #614158.
-rw-r--r--gst/id3demux/id3v2frames.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c
index 79fdf61b3..021a3d173 100644
--- a/gst/id3demux/id3v2frames.c
+++ b/gst/id3demux/id3v2frames.c
@@ -116,9 +116,11 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work)
}
frame_data += 4;
frame_data_size -= 4;
- if (work->parse_size < frame_data_size) {
- GST_WARNING ("ID3v2 frame %s has invalid size %d.", tag_name,
- frame_data_size);
+ GST_LOG ("Un-unsynced data size %d (of %d)", work->parse_size,
+ frame_data_size);
+ if (work->parse_size > frame_data_size) {
+ GST_WARNING ("ID3v2 frame %s data has invalid size %d (>%d)",
+ work->frame_id, work->parse_size, frame_data_size);
return FALSE;
}
}