diff mbox series

[FFmpeg-devel,2/4] avcodec/rasc: Check frame before clearing

Message ID 20201204000707.7805-2-michael@niedermayer.cc
State Accepted
Commit 380a3a0adfae7aa898d2ec8a5b0d5cd949a11111
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

Commit Message

Michael Niedermayer Dec. 4, 2020, 12:07 a.m. UTC 
Fixes: null pointer dereference
Fixes: 27737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-5769028685266944

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/rasc.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer Jan. 8, 2021, 5:09 p.m. UTC | #1 
On Fri, Dec 04, 2020 at 01:07:05AM +0100, Michael Niedermayer wrote:
> Fixes: null pointer dereference
> Fixes: 27737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-5769028685266944
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/rasc.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply remainder of the set

[...]
diff mbox series

Patch

diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c
index cdf20a6db9..706940bf5f 100644
--- a/libavcodec/rasc.c
+++ b/libavcodec/rasc.c
@@ -70,6 +70,9 @@  static void clear_plane(AVCodecContext *avctx, AVFrame *frame)
     RASCContext *s = avctx->priv_data;
     uint8_t *dst = frame->data[0];
 
+    if (!dst)
+        return;
+
     for (int y = 0; y < avctx->height; y++) {
         memset(dst, 0, avctx->width * s->bpp);
         dst += frame->linesize[0];