diff options
author | Vitaly Buka <vitalybuka-at-google.com@ffmpeg.org> | 2017-08-20 21:56:47 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-17 16:57:27 +0300 |
commit | 7b6dba892f63a620d4510c9114f414cfa6435942 (patch) | |
tree | c394a9e5420a13ca5f836951b605ee648337efc7 | |
parent | edac232860366fc954dc93f4610f76b6062ba933 (diff) |
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 a77d6908e3..1815a7303f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4415,7 +4415,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; |