aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
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 15:32:29 +0200
commitb7fdc2d02b81d285ac1a1a21deac3bdf61569734 (patch)
treec1a3ba7b5701fecbae5ff9f8aa1291b28d55dcd3 /libavcodec
parent219c025463c4e5634129b73a72a13e0f6ab70150 (diff)
downloadffmpeg-b7fdc2d02b81d285ac1a1a21deac3bdf61569734.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> (cherry picked from commit 1d633e6a0a61118c9b2d1785d96bdebaa8c38592) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index 73fcf51b7b..48af4270cb 100644
--- a/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@ -1196,6 +1196,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);
}
}