summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-05-04 22:52:41 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-06-18 18:58:25 +0200
commit216eb60b853e9a230c1238ab7d1c63d3fa892d34 (patch)
tree6bc122c877aea54c22e64035bbdd6855dfcdc62c
parentb72d657b73b2aa4a2a2f72f613199e6080ad48c0 (diff)
avcodec/iff: Only write palette to plane 1 if its PAL8
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@niedermayer.cc>
-rw-r--r--libavcodec/iff.c3
1 files changed, 2 insertions, 1 deletions
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;