diff mbox series

[FFmpeg-devel,1/4] avcodec/cdgraphics: Check frame before clearing

Message ID 20201204000707.7805-1-michael@niedermayer.cc
State Accepted
Commit fef17e89283f8b72fc125cd066dce15a875802f6
Headers show
Series [FFmpeg-devel,1/4] avcodec/cdgraphics: Check frame before clearing | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer Dec. 4, 2020, 12:07 a.m. UTC 
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/cdgraphics.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Anton Khirnov Dec. 4, 2020, 10:27 a.m. UTC | #1 
Quoting Michael Niedermayer (2020-12-04 01:07:04)
> 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
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Looks ok.
Michael Niedermayer Dec. 4, 2020, 4:43 p.m. UTC | #2 
On Fri, Dec 04, 2020 at 11:27:46AM +0100, Anton Khirnov wrote:
> Quoting Michael Niedermayer (2020-12-04 01:07:04)
> > 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
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> 
> Looks ok.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index 965f43684a..263459d0f2 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);