From fef17e89283f8b72fc125cd066dce15a875802f6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 4 Dec 2020 01:07:04 +0100 Subject: [PATCH] avcodec/cdgraphics: Check frame before clearing Fixes: null pointer dereference Fixes: 27730/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-6212402236096512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Anton Khirnov Signed-off-by: Michael Niedermayer --- libavcodec/cdgraphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 965f43684ad..263459d0f2e 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -369,6 +369,9 @@ static void cdg_decode_flush(AVCodecContext *avctx) { CDGraphicsContext *cc = avctx->priv_data; + if (!cc->frame->data[0]) + return; + memset(cc->frame->data[0], 0, cc->frame->linesize[0] * avctx->height); if (!avctx->frame_number) memset(cc->frame->data[1], 0, AVPALETTE_SIZE); -- 2.39.5