diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 01:23:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-02 11:14:25 +0100 |
| commit | c36f5df34aca867af08313a885cc1131b489c57e (patch) | |
| tree | 91d870d14615777318fa271e139b218fa13a8f17 | |
| parent | 23b3fe00bb0d44a073f7a8e0a51f5c42d05facb4 (diff) | |
| download | ffmpeg-c36f5df34aca867af08313a885cc1131b489c57e.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 08771e5c3c..75a1f9385d 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -598,10 +598,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; } |