virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

Fix id3v2 extended header handling.

Browse Source 
When skipping over the extended header, take into account
that the size field has already been read. The extended header
also takes up space, so adjust total header length accordingly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Adrian Drzewiecki 2011-12-01 23:27:41 +01:00 committed by Michael Niedermayer
parent 18abf46b6f
commit dd7453a24e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/id3v2.c
View File

@ -456,8 +456,22 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
unsync = flags & 0x80;
if (isv34 && flags & 0x40) /* Extended header present, just skip over it */
avio_skip(s->pb, get_size(s->pb, 4));
/* Extended header present, just skip over it */
if (isv34 && flags & 0x40) {
int size = get_size(s->pb, 4);
if (size < 6) {
reason = "extended header too short.";
goto error;
}
len -= size;
if (len < 0) {
reason = "extended header too long.";
goto error;
}
/* already seeked past size, skip the reset */
size -= 4;
avio_skip(s->pb, size);
}
while (len >= taghdrlen) {
unsigned int tflags = 0;