aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-16 19:57:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-17 02:25:28 +0200
commitc436af15596a4c3c4d43a9928f32837c913b25bc (patch)
treef875340a1c5f7346dd2fd4b0c654fd9f0784061b
parenteb38f232b4ed613bafa088fa60b6bd6018303aac (diff)
downloadffmpeg-c436af15596a4c3c4d43a9928f32837c913b25bc.tar.gz
avcodec/jpeg2000dec: Check nonzerobits more completely
Fixes: runtime error: shift exponent 36 is too large for 32-bit type 'int' Fixes: 2239/clusterfuzz-testcase-minimized-5639766592716800 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 dfb61ea2630029b7aec7911aade769bf1a914eea) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/jpeg2000dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 27dad4a78a..9c2aae6d75 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -959,9 +959,9 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
if (!cblk->npasses) {
int v = expn[bandno] + numgbits - 1 -
tag_tree_decode(s, prec->zerobits + cblkno, 100);
- if (v < 0) {
+ if (v < 0 || v > 30) {
av_log(s->avctx, AV_LOG_ERROR,
- "nonzerobits %d invalid\n", v);
+ "nonzerobits %d invalid or unsupported\n", v);
return AVERROR_INVALIDDATA;
}
cblk->nonzerobits = v;