[FFmpeg-cvslog] Avoid a possible overflow when reading Nikon avi files.
Carl Eugen Hoyos
git at videolan.org
Mon Jan 20 20:06:05 CET 2014
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jan 20 11:40:35 2014 +0100| [b7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1] | committer: Carl Eugen Hoyos
Avoid a possible overflow when reading Nikon avi files.
Suggested-by: Reimar
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1
---
libavformat/avidec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 57fbcd7..bab62a0 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) {
More information about the ffmpeg-cvslog
mailing list