From: Michael Niedermayer Date: Mon, 8 May 2017 09:46:03 +0000 (+0200) Subject: avcodec/cdxl: Check format for BGR24 X-Git-Tag: n3.4~1679 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1e42736b95065c69a7481d0cf55247024f54b660;hp=78f51ecb7411bdea5a07242bcc2c8b0283742c2e avcodec/cdxl: Check format for BGR24 Fixes: out of array access Fixes: 1427/clusterfuzz-testcase-minimized-5020737339392000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 5c0ecb279c..78f5d50102 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -279,7 +279,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; if (!encoding && c->palette_size && c->bpp <= 8 && c->format != CHUNKY) { avctx->pix_fmt = AV_PIX_FMT_PAL8; - } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) { + } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8) && c->format != CHUNKY) { if (c->palette_size != (1 << (c->bpp - 1))) return AVERROR_INVALIDDATA; avctx->pix_fmt = AV_PIX_FMT_BGR24;