diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-08 11:46:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-16 16:00:23 +0200 |
| commit | 4f98b97b2ad1ea2244cd8f10758802d9bdc58e16 (patch) | |
| tree | 388e82ca4226c014afe0b464030428ec5c88b927 | |
| parent | 782473f9dfcaca5e3732a6ed0af3df9f2b5981d0 (diff) | |
| download | ffmpeg-4f98b97b2ad1ea2244cd8f10758802d9bdc58e16.tar.gz | |
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 <michael@niedermayer.cc>
(cherry picked from commit 1e42736b95065c69a7481d0cf55247024f54b660)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cdxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |