Allow decoding of slightly broken Nikon avi files.

Fixes ticket #3330. (cherry picked from commit f9c2d4d17e3b18becb046d71811f9e8aa5946cf9) Conflicts: libavformat/avidec.c
2014-01-20 22:37:18 +01:00 · 2014-01-20 22:37:18 +01:00 · 4fdcb1e1b7
commit 4fdcb1e1b7
parent b902ba478c
1 changed files with 1 additions and 0 deletions
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@ -327,6 +327,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
                uint16_t size = avio_rl16(s->pb);
                const char *name = NULL;
                char buffer[64] = {0};
+                size = FFMIN(size, tag_end - avio_tell(s->pb));
                size -= avio_read(s->pb, buffer,
                                   FFMIN(size, sizeof(buffer)-1));
                switch (tag) {