From 321c418b8715e9b3142648561dcd1fd6494a9d62 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 15 Dec 2018 00:10:17 +0100 Subject: [PATCH] avcodec/rasc: Check that the number of moves is less than or equal the number of pixels Fixes: OOM Fixes: 10307/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-5393974559244288 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer (cherry picked from commit 092cb17983b2660b4e050a05c739060f8e03d27a) Signed-off-by: Michael Niedermayer --- libavcodec/rasc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c index 67351dfd19..1b607ac31e 100644 --- a/libavcodec/rasc.c +++ b/libavcodec/rasc.c @@ -215,7 +215,7 @@ static int decode_move(AVCodecContext *avctx, bytestream2_skip(gb, 8); compression = bytestream2_get_le32(gb); - if (nb_moves > INT32_MAX / 16) + if (nb_moves > INT32_MAX / 16 || nb_moves > avctx->width * avctx->height) return AVERROR_INVALIDDATA; uncompressed_size = 16 * nb_moves;