diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-07 20:43:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-31 22:56:15 +0100 |
| commit | c65c4c475975ced7e296fc68946d97c64f8077fb (patch) | |
| tree | 056f9f26178766b1c9b411e232c59ae8b88fdfce | |
| parent | c860d5326f566acf039400a1e80004cb3d5d6685 (diff) | |
| download | ffmpeg-c65c4c475975ced7e296fc68946d97c64f8077fb.tar.gz | |
avcodec/diracdec: Fix integer overflow with quant
Fixes: signed integer overflow: 2 + 2147483646 cannot be represented in type 'int'
Fixes: 4792/clusterfuzz-testcase-minimized-6322450775146496
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 eaa93175895568ef6c2542b13104874907d9c4ef)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/diracdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index ba7f8ee7eb..7c7a31e830 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -532,16 +532,16 @@ static inline void codeblock(DiracContext *s, SubBand *b, } if (s->codeblock_mode && !(s->old_delta_quant && blockcnt_one)) { - int quant = b->quant; + int quant; if (is_arith) - quant += dirac_get_arith_int(c, CTX_DELTA_Q_F, CTX_DELTA_Q_DATA); + quant = dirac_get_arith_int(c, CTX_DELTA_Q_F, CTX_DELTA_Q_DATA); else - quant += dirac_get_se_golomb(gb); - if (quant < 0) { + quant = dirac_get_se_golomb(gb); + if (quant > INT_MAX - b->quant || b->quant + quant < 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid quant\n"); return; } - b->quant = quant; + b->quant += quant; } b->quant = FFMIN(b->quant, MAX_QUANT); |