[FFmpeg-cvslog] apetag: fix the amount of data read from binary tags.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jun 26 18:54:00 2012 +0200| [b72767df8e4f496da36138aa7127e408c1cde7f8] | committer: Anton Khirnov

apetag: fix the amount of data read from binary tags.

Substract the filename size from the data size.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b72767df8e4f496da36138aa7127e408c1cde7f8
---

 libavformat/apetag.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index e5c839e..f8653d3 100644
--- a/libavformat/apetag.c
+++ b/libavformat/apetag.c
@@ -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);