diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 01:23:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:53:11 +0100 |
| commit | 917946e1c96e0e6763970d3e39991f3efa923316 (patch) | |
| tree | 3b4f94478e2838e407833135c621dd12ba8f80f9 | |
| parent | 95fa91d97525b9064d7d0b5e7ec03112e9f8a729 (diff) | |
| download | ffmpeg-917946e1c96e0e6763970d3e39991f3efa923316.tar.gz | |
avcodec/diracdec: Use 64bit in calculation of codeblock coordinates
Fixes integer overflow
Fixes out of array read
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 526886e6069636a918c8c04db17e864e3d8151c1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/diracdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index a9a8c27712..c0b5a65cdb 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -615,10 +615,10 @@ static av_always_inline void decode_subband_internal(DiracContext *s, SubBand *b top = 0; for (cb_y = 0; cb_y < cb_height; cb_y++) { - bottom = (b->height * (cb_y+1)) / cb_height; + bottom = (b->height * (cb_y+1LL)) / cb_height; left = 0; for (cb_x = 0; cb_x < cb_width; cb_x++) { - right = (b->width * (cb_x+1)) / cb_width; + right = (b->width * (cb_x+1LL)) / cb_width; codeblock(s, b, &gb, &c, left, right, top, bottom, blockcnt_one, is_arith); left = right; } |