diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-26 20:26:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-28 03:41:07 +0200 |
| commit | d40bb6f5e93423c460f3ef079fae08633ed9df6b (patch) | |
| tree | d8f45276df54ef1d7c2e60a23092da15a76bcbc8 | |
| parent | aadfec7d6ca9b56b2bc0e24fa0aa4a29e301d664 (diff) | |
| download | ffmpeg-d40bb6f5e93423c460f3ef079fae08633ed9df6b.tar.gz | |
avcodec/diracdec: Fix integer overflow in signed multiplication in UNPACK_ARITH()
Fixes: runtime error: signed integer overflow: 1073741823 * 4 cannot be represented in type 'int'
Fixes: 2729/clusterfuzz-testcase-minimized-5902915464069120
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 8e275a74b09cc87f4334ed572f919b7647d4bea1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/diracdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 39f062eb8e..42ccbb5746 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -454,7 +454,8 @@ static inline int coeff_unpack_golomb(GetBitContext *gb, int qfactor, int qoffse static inline void coeff_unpack_arith_##n(DiracArith *c, int qfactor, int qoffset, \ SubBand *b, type *buf, int x, int y) \ { \ - int coeff, sign, sign_pred = 0, pred_ctx = CTX_ZPZN_F1; \ + int sign, sign_pred = 0, pred_ctx = CTX_ZPZN_F1; \ + unsigned coeff; \ const int mstride = -(b->stride >> (1+b->pshift)); \ if (b->parent) { \ const type *pbuf = (type *)b->parent->ibuf; \ |