diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-03-31 07:52:42 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-04-01 19:49:37 +0200 |
| commit | 2e693be7e9b1a70360dd6849a58fae74b16afba1 (patch) | |
| tree | 27cd535b122ca7cb64006860b69f1c2f91ebb6c5 | |
| parent | 15df4428d264287ec1577f92296b178f86cbe14d (diff) | |
| download | ffmpeg-2e693be7e9b1a70360dd6849a58fae74b16afba1.tar.gz | |
id3v2: fix skipping extended header in id3v2.4
In v2.4, the length includes the length field itself.
(cherry picked from commit ddb4431208745ea270dce8fce4cba999f0ed4303)
Conflicts:
libavformat/id3v2.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/mp3.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index fa383d6512..ca414082ea 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -246,8 +246,17 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t fl goto error; } - if(isv34 && flags & 0x40) /* Extended header present, just skip over it */ - url_fskip(s->pb, id3v2_get_size(s->pb, 4)); + if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */ + int extlen = id3v2_get_size(s->pb, 4); + if (version == 4) + extlen -= 4; // in v2.4 the length includes the length field we just read + + if (extlen < 0) { + reason = "invalid extended header length"; + goto error; + } + url_fskip(s->pb, extlen); + } while(len >= taghdrlen) { if(isv34) { |