[FFmpeg-cvslog] Allow decoding of slightly broken Nikon avi files.

[Carl Eugen Hoyos]

ffmpeg | branch: release/1.2 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jan 20 22:37:18 2014 +0100| [4fdcb1e1b7b1369b74faeeae2358feed7989de1b] | committer: Carl Eugen Hoyos

Allow decoding of slightly broken Nikon avi files.

Fixes ticket #3330.
(cherry picked from commit f9c2d4d17e3b18becb046d71811f9e8aa5946cf9)

Conflicts:
	libavformat/avidec.c

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

 libavformat/avidec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 2d60bfb..d2f0152 100644
--- 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) {