apetag: fix the amount of data read from binary tags.
authorAnton Khirnov <anton@khirnov.net>
Tue, 26 Jun 2012 16:54:00 +0000 (18:54 +0200)
committerAnton Khirnov <anton@khirnov.net>
Mon, 2 Jul 2012 14:15:45 +0000 (16:15 +0200)
Substract the filename size from the data size.

libavformat/apetag.c

index e5c839e..f8653d3 100644 (file)
@@ -59,7 +59,12 @@ static int ape_tag_read_field(AVFormatContext *s)
         AVStream *st = avformat_new_stream(s, NULL);
         if (!st)
             return AVERROR(ENOMEM);
-        avio_get_str(pb, size, filename, sizeof(filename));
+
+        size -= avio_get_str(pb, size, filename, sizeof(filename));
+        if (size <= 0) {
+            av_log(s, AV_LOG_WARNING, "Skipping binary tag '%s'.\n", key);
+            return 0;
+        }
         st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
         if (!st->codec->extradata)
             return AVERROR(ENOMEM);