diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-13 00:11:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 12:43:08 +0200 |
| commit | 91610632485060575a7c8a03a58f143689627222 (patch) | |
| tree | 45e751314ff0486f26c43747fc67c24e5b1dc14c | |
| parent | b35b3dfc251a1e832bcb79ead910e34df20cc4df (diff) | |
| download | ffmpeg-91610632485060575a7c8a03a58f143689627222.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>
| -rw-r--r-- | libavcodec/ivi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 2a9da6411f..eaaef78a30 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -1171,6 +1171,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); } } |