Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master: Allow decoding of slightly broken Nikon avi files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 4014b401b0
parent a493f8541d f9c2d4d17e
commit 4014b401b0
1 changed files with 2 additions and 0 deletions
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@ -350,6 +350,8 @@ 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 };
+                if (avio_tell(s->pb) + size > tag_end)
+                    size = tag_end - avio_tell(s->pb);
                size -= avio_read(s->pb, buffer,
                                  FFMIN(size, sizeof(buffer) - 1));
                switch (tag) {