diff options
author | Vitaly Buka <vitalybuka-at-google.com@ffmpeg.org> | 2017-08-20 11:56:47 -0700 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-10 01:33:28 +0200 |
commit | c8890413520a0a07cfc1d2856baae466522690c1 (patch) | |
tree | fecc88746add8937b017eddb7c6beb91089aef72 | |
parent | b6a79b841dcdf8edebc38579088bf48a418c82dc (diff) | |
download | ffmpeg-c8890413520a0a07cfc1d2856baae466522690c1.tar.gz |
avformat/mov: Fix signed integer overflows with total_size
Signed integer overflow is undefined behavior.
Detected with clang and -fsanitize=signed-integer-overflow
Signed-off-by: Vitaly Buka <vitalybuka@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4a404cb5b90b878cbe1bb528fac65cf508668cc5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 036693a652..6b1cee8d6c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5362,7 +5362,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size < 0) atom.size = INT64_MAX; - while (total_size + 8 <= atom.size && !avio_feof(pb)) { + while (total_size <= atom.size - 8 && !avio_feof(pb)) { int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; a.size = atom.size; a.type=0; |