]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/cdgraphics: Check frame before clearing
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 4 Dec 2020 00:07:04 +0000 (01:07 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 4 Dec 2020 23:08:33 +0000 (00:08 +0100)
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 <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/cdgraphics.c

index 965f43684ad8e6c27e11633d3b72592ecc44d566..263459d0f2e1d98f99c1a7b2a487fde8897e237c 100644 (file)
@@ -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);