summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-02-18 22:33:02 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-15 22:38:05 +0200
commit284116d32d272a2a6590b09bb26cefe9d87fa77f (patch)
tree539d528c39b5745cc1afe5f001448a01a50bc149
parentd29a0549153b0f27c172ba3ccfbc3b9e39233345 (diff)
downloadffmpeg-284116d32d272a2a6590b09bb26cefe9d87fa77f.tar.gz
avcodec/ffv1dec: Check that num h/v slices is supported
Fixes: out of array access Fixes: 55597/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4898293416329216 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 8ead0ae68eb64ad325efafd686c434727f3d666a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/ffv1dec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index e7b7e7309c..82a9c20853 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -475,6 +475,11 @@ static int read_extra_header(FFV1Context *f)
return AVERROR_INVALIDDATA;
}
+ if (f->num_h_slices > MAX_SLICES / f->num_v_slices) {
+ av_log(f->avctx, AV_LOG_ERROR, "slice count unsupported\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
f->quant_table_count = get_symbol(c, state, 0);
if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) {
av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);