diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-07 16:42:39 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-07 16:42:39 +0100 |
| commit | 04172830773414dafb698fd842b65b935277df92 (patch) | |
| tree | b6ab7e4861aac31f67eda7a7223b505f4ca2bcbc /gst/id3demux | |
| parent | 3ec0a31d641815b131a27f7a1bec7b0e568b2e6d (diff) | |
id3demux: sizes in ID3 v2.3 are unlikely to be sync-safe integers
In ID3 v2.3 compressed frames will have a 4-byte data length indicator
after the frame header to indicate the size of the decompressed data.
This integer is unlikely to be a sync-safe integer for v2.3 tags,
only in v2.4 it's sync-safe.
Diffstat (limited to 'gst/id3demux')
| -rw-r--r-- | gst/id3demux/id3v2frames.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c index a0331ef3..80a123a2 100644 --- a/gst/id3demux/id3v2frames.c +++ b/gst/id3demux/id3v2frames.c @@ -108,7 +108,11 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work) ID3V2_FRAME_FORMAT_DATA_LENGTH_INDICATOR)) { if (work->hdr.frame_data_size <= 4) return FALSE; - work->parse_size = read_synch_uint (frame_data, 4); + if (ID3V2_VER_MAJOR (work->hdr.version) == 3) { + work->parse_size = GST_READ_UINT32_BE (frame_data); + } else { + work->parse_size = read_synch_uint (frame_data, 4); + } frame_data += 4; frame_data_size -= 4; if (work->parse_size < frame_data_size) { |