avcodec/rscc: Check inflated_buf size whan it is used

Fixes: out of array access
Fixes: 27434/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-5196757675540480

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
This commit is contained in:
Michael Niedermayer 2020-11-22 00:31:47 +01:00
parent ab82c10578
commit a5ed6da9bd
1 changed files with 4 additions and 0 deletions

View File

@ -300,6 +300,10 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto end; goto end;
} }
if (ctx->inflated_size < pixel_size) {
ret = AVERROR_INVALIDDATA;
goto end;
}
ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size); ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size);
if (ret) { if (ret) {
av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret); av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret);