aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-11 21:04:12 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-09 13:53:29 +0200
commit1630c9e0b6e62a2ec03533a95d8bea7b4fc72183 (patch)
treee15650cf69a32821f6ac5802299b3caee8f7d770
parent5213143514001604562590e6cf2e8c030948e9ef (diff)
downloadffmpeg-1630c9e0b6e62a2ec03533a95d8bea7b4fc72183.tar.gz
avcodec/dpx: Check bits_per_color earlier
Fixes: shift exponent 251 is too large for 32-bit type 'int' Fixes: 32147/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DPX_fuzzer-5519111675314176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c093eb30311b7148a4da1c7555498187c8cdf0db) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dpx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index cf23bb6ba1..5f47b9e341 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -175,6 +175,9 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_PATCHWELCOME;
}
+ if (bits_per_color > 32)
+ return AVERROR_INVALIDDATA;
+
buf += 820;
avctx->sample_aspect_ratio.num = read32(&buf, endian);
avctx->sample_aspect_ratio.den = read32(&buf, endian);