aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-13 00:11:37 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-21 09:31:08 +0200
commit1d633e6a0a61118c9b2d1785d96bdebaa8c38592 (patch)
treecf3ef1b787399aed882b5f67eede54b05ebbf297
parent2570a8777e7095358b10f679d35641e114a2ab33 (diff)
downloadffmpeg-1d633e6a0a61118c9b2d1785d96bdebaa8c38592.tar.gz
avcodec/ivi: Clear got_p_frame before decoding a new frame using it
Fixes: assertion failure Fixes: 21666/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-5706468994318336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/ivi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index 7d3749b818..c5c50fb5c1 100644
--- a/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@ -1192,6 +1192,8 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket pkt;
pkt.data = avpkt->data + (get_bits_count(&ctx->gb) >> 3);
pkt.size = get_bits_left(&ctx->gb) >> 3;
+ ctx->got_p_frame = 0;
+ av_frame_unref(ctx->p_frame);
ff_ivi_decode_frame(avctx, ctx->p_frame, &ctx->got_p_frame, &pkt);
}
}