From b7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 20 Jan 2014 11:40:35 +0100
Subject: [PATCH] Avoid a possible overflow when reading Nikon avi files.

Suggested-by: Reimar
---
 libavformat/avidec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 57fbcd7a1b..bab62a08c1 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -350,8 +350,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 };
-                if (avio_tell(s->pb) + size > tag_end)
-                    size = tag_end - avio_tell(s->pb);
+                size = FFMIN(size, tag_end - avio_tell(s->pb));
                 size -= avio_read(s->pb, buffer,
                                   FFMIN(size, sizeof(buffer) - 1));
                 switch (tag) {