diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-06-09 01:59:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-07-07 21:52:52 +0200 |
| commit | b418ad75c2238d36b1d28050e7f37911b9ae64d4 (patch) | |
| tree | 14b091cc6c9589e23c050582c4ff71c79632c7b9 /libavcodec/flashsv.c | |
| parent | 4ff654e0306481885432301d58f2eeae88d1bc18 (diff) | |
| download | ffmpeg-b418ad75c2238d36b1d28050e7f37911b9ae64d4.tar.gz | |
avcodec/flashsv: Clear pointers
Fixes: Use after free
Fixes: 47399/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLASHSV2_fuzzer-5718646686613504
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/flashsv.c')
| -rw-r--r-- | libavcodec/flashsv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index d8943d9cf8..4357b25d04 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -350,6 +350,9 @@ static int flashsv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (err < 0) return err; s->keyframedata = avpkt->data; + if (s->blocks) + memset(s->blocks, 0, (v_blocks + !!v_part) * (h_blocks + !!h_part) * + sizeof(s->blocks[0])); } if(s->ver == 2 && !s->blocks) s->blocks = av_mallocz((v_blocks + !!v_part) * (h_blocks + !!h_part) * @@ -558,6 +561,7 @@ static av_cold int flashsv2_decode_end(AVCodecContext *avctx) FlashSVContext *s = avctx->priv_data; av_buffer_unref(&s->keyframedata_buf); + s->keyframedata = NULL; av_freep(&s->blocks); av_freep(&s->keyframe); flashsv_decode_end(avctx); |