| Message ID | 20220609000548.14180-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | b418ad75c2238d36b1d28050e7f37911b9ae64d4 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/flashsv: Clear pointers | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, Jun 09, 2022 at 02:05:48AM +0200, Michael Niedermayer wrote: > 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> > --- > libavcodec/flashsv.c | 4 ++++ > 1 file changed, 4 insertions(+) will apply [...]
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 0982161d49..5ea7e56dd5 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -346,6 +346,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) * @@ -554,6 +557,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);
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> --- libavcodec/flashsv.c | 4 ++++ 1 file changed, 4 insertions(+)