Commit 0be0197f authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/imm4: Unreference previous frame on frame size change

Fixes: Out of array access
Fixes: 13552/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5767949648920576

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 1144d5c9
...@@ -446,11 +446,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, ...@@ -446,11 +446,13 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (!frame->key_frame && if (avctx->width != width ||
(avctx->width != width || avctx->height != height) {
avctx->height != height)) { if (!frame->key_frame) {
av_log(avctx, AV_LOG_ERROR, "Frame size change is unsupported.\n"); av_log(avctx, AV_LOG_ERROR, "Frame size change is unsupported.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
av_frame_unref(s->prev_frame);
} }
ret = ff_set_dimensions(avctx, width, height); ret = ff_set_dimensions(avctx, width, height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment