[FFmpeg-devel] [PATCH 3/3] avcodec/iff: Only write palette to plane 1 if its PAL8

Michael Niedermayer michael at niedermayer.cc
Wed May 5 00:05:04 EEST 2021


Fixes: null pointer passed as argument 1, which is declared to never be null
Fixes: 33791/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5107575256383488.fuzz

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

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index b5f04e7e16..6a4c466b44 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -1847,7 +1847,8 @@ static int decode_frame(AVCodecContext *avctx,
                     buf += s->planesize;
                 }
             }
-            memcpy(frame->data[1], s->pal, 256 * 4);
+            if (avctx->pix_fmt == AV_PIX_FMT_PAL8)
+                memcpy(frame->data[1], s->pal, 256 * 4);
         } else if (s->ham) {
             int i, count = 1 << s->ham;
 
-- 
2.17.1



More information about the ffmpeg-devel mailing list