id3v2: fix skipping extended header in id3v2.4

In v2.4, the length includes the length field itself.

1 files changed, 11 insertions, 2 deletions

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 9488fd856d..3891897bb3 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -561,8 +561,17 @@ 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));
+    if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */
+        int extlen = 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;
+        }
+        avio_skip(s->pb, extlen);
+    }
 
     while (len >= taghdrlen) {
         unsigned int tflags = 0;