aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-04 09:33:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-05 19:34:33 +0200
commit8b8f5fd05e7e0c20b2fd12e8a4e9f2542eba7e3a (patch)
treea7daad59f058c5d61305ae01e740dc880fc6dc02
parent889fdc690a3ff0166e24e3c6403bbd320041094a (diff)
downloadffmpeg-8b8f5fd05e7e0c20b2fd12e8a4e9f2542eba7e3a.tar.gz
avcodec/mss3: Check for the rac stream being invalid in rac_normalize()
Fixes: out of array read Fixes: 15982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSA1_fuzzer-5630676251967488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 99a172f3f4d0bef024c6293f575caaaddce0b267) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mss3.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c
index 21226f9085..02bd360996 100644
--- a/libavcodec/mss3.c
+++ b/libavcodec/mss3.c
@@ -298,6 +298,10 @@ static void rac_normalise(RangeCoder *c)
c->got_error = 1;
c->low = 1;
}
+ if (c->low > c->range) {
+ c->got_error = 1;
+ c->low = 1;
+ }
if (c->range >= RAC_BOTTOM)
return;
}