id3v2: explicitly seek to the end of the tag after reading

Current code might stop in the middle of an invalid tag.

fixes issue2650

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov 2011-03-17 07:10:23 +01:00 committed by Ronald S. Bultje
parent 933e90a69a
commit bca6dee386

@ -186,7 +186,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
{ {
int isv34, tlen, unsync; int isv34, tlen, unsync;
char tag[5]; char tag[5];
int64_t next; int64_t next, end = avio_tell(s->pb) + len;
int taghdrlen; int taghdrlen;
const char *reason; const char *reason;
AVIOContext pb; AVIOContext pb;
@ -284,8 +284,9 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
avio_skip(s->pb, len); avio_skip(s->pb, len);
} }
if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
avio_skip(s->pb, 10); end += 10;
avio_seek(s->pb, end, SEEK_SET);
av_free(buffer); av_free(buffer);
return; return;