mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/pgxdec: Check depth more completely
Fixes: shift exponent -1 is negative Fixes: 26107/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGX_fuzzer-5378790047612928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
857aba7c45
commit
389b9e9b4f
@ -133,14 +133,14 @@ static int pgx_decode_frame(AVCodecContext *avctx, void *data,
|
||||
if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
|
||||
return ret;
|
||||
|
||||
if (depth <= 8) {
|
||||
if (depth > 0 && depth <= 8) {
|
||||
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
|
||||
bpp = 8;
|
||||
} else if (depth <= 16) {
|
||||
} else if (depth > 0 && depth <= 16) {
|
||||
avctx->pix_fmt = AV_PIX_FMT_GRAY16;
|
||||
bpp = 16;
|
||||
} else {
|
||||
av_log(avctx, AV_LOG_ERROR, "Maximum depth of 16 bits supported.\n");
|
||||
av_log(avctx, AV_LOG_ERROR, "depth %d is invalid or unsupported.\n", depth);
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
if (bytestream2_get_bytes_left(&g) < width * height * (bpp >> 3))
|
||||
|
Loading…
Reference in New Issue
Block a user