diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 22:24:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 23:23:39 +0200 |
| commit | e1b60aad77c27ed5d4dfc11e5e6a05a38c70489d (patch) | |
| tree | d7e6818a5f0d97016b90dc48d0af8695d29a2cbf /libavcodec/cdxl.c | |
| parent | 277e397eb5964999bd76909f52d4bd3350289c22 (diff) | |
| download | ffmpeg-streaming-e1b60aad77c27ed5d4dfc11e5e6a05a38c70489d.zip ffmpeg-streaming-e1b60aad77c27ed5d4dfc11e5e6a05a38c70489d.tar.gz | |
avcodec/cdxl: Check format parameter
Fixes out of array access
Fixes: 1378/clusterfuzz-testcase-minimized-5715088008806400
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cdxl.c')
| -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 7a9b419..5c0ecb2 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -277,7 +277,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, c->padded_bits = aligned_width - c->avctx->width; if (c->video_size < aligned_width * avctx->height * (int64_t)c->bpp / 8) return AVERROR_INVALIDDATA; - if (!encoding && c->palette_size && c->bpp <= 8) { + 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)) { if (c->palette_size != (1 << (c->bpp - 1))) |
