From b3c25263d1ee1aa14a0e69c9423f5bd4cacfb4ce Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 26 Sep 2019 21:56:48 +0200 Subject: [PATCH] avcodec/scpr: Check minimum size of type 17 Improves: Timeout (85sec -> 46sec) Improves: 17644/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5715704283660288 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 --- libavcodec/scpr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index ab4d5b57df7..2a0ebcecfcd 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -534,6 +534,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, uint32_t clr, *dst = (uint32_t *)s->current_frame->data[0]; int y; + if (bytestream2_get_bytes_left(gb) < 3) + return AVERROR_INVALIDDATA; + frame->key_frame = 1; bytestream2_skip(gb, 1); if (avctx->bits_per_coded_sample == 16) { -- 2.39.5