diff mbox series

[FFmpeg-devel] avcodec/ivi: Clear got_p_frame before decoding a new frame using it

Message ID 20200512230626.21934-1-michael@niedermayer.cc
State Accepted
Commit 1d633e6a0a61118c9b2d1785d96bdebaa8c38592
Headers show
Series [FFmpeg-devel] avcodec/ivi: Clear got_p_frame before decoding a new frame using it | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer May 12, 2020, 11:06 p.m. UTC 
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>
---
 libavcodec/ivi.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer May 21, 2020, 10:13 a.m. UTC | #1 
On Wed, May 13, 2020 at 01:06:26AM +0200, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/ivi.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index 7d3749b818b..c5c50fb5c12 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);
         }
     }