aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-03 09:20:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-12 02:55:46 +0100
commit1e6f641052aad75cbf4b7c2d7207625359a16292 (patch)
tree773c3b415d1e509ca5df9c3c501873282c1af1d6
parent03ef13889c1965c5b5f5d383815438389695a2a4 (diff)
downloadffmpeg-1e6f641052aad75cbf4b7c2d7207625359a16292.tar.gz
avformat/mov: Fix integer overflow in FFABS
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 053e80f6eaf8d87521fe58ea96886b6ee0bbe59d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index b42537f562..20a574912d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2354,7 +2354,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c->fc, AV_LOG_TRACE, "count=%d, duration=%d\n",
count, duration);
- if (FFABS(duration) > (1<<28) && i+2<entries) {
+ if (FFNABS(duration) < -(1<<28) && i+2<entries) {
av_log(c->fc, AV_LOG_WARNING, "CTTS invalid\n");
av_freep(&sc->ctts_data);
sc->ctts_count = 0;