RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/dirac_dwt: Fix multiple overflows in 9/7 lifting 

Fixes: runtime error: signed integer overflow: 1073901567 + 1073901567 cannot be represented in type 'int'
Fixes: 3124/clusterfuzz-testcase-minimized-454643435752652

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-09-01 19:56:11 +02:00
parent 2a0823ae96
commit f71cd44147
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dirac_dwt.h
View File

@ -117,16 +117,16 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
(b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8))
#define COMPOSE_DAUB97iL1(b0, b1, b2)\ #define COMPOSE_DAUB97iL1(b0, b1, b2)\
(b1 - ((int)(1817U*(b0 + b2) + 2048) >> 12)) (b1 - ((int)(1817*(b0 + (unsigned)b2) + 2048) >> 12))
#define COMPOSE_DAUB97iH1(b0, b1, b2)\ #define COMPOSE_DAUB97iH1(b0, b1, b2)\
(b1 - ((int)( 113U*(b0 + b2) + 64) >> 7)) (b1 - ((int)( 113*(b0 + (unsigned)b2) + 64) >> 7))
#define COMPOSE_DAUB97iL0(b0, b1, b2)\ #define COMPOSE_DAUB97iL0(b0, b1, b2)\
(b1 + ((int)( 217U*(b0 + b2) + 2048) >> 12)) (b1 + ((int)( 217*(b0 + (unsigned)b2) + 2048) >> 12))
#define COMPOSE_DAUB97iH0(b0, b1, b2)\ #define COMPOSE_DAUB97iH0(b0, b1, b2)\
(b1 + ((int)(6497U*(b0 + b2) + 2048) >> 12)) (b1 + ((int)(6497*(b0 + (unsigned)b2) + 2048) >> 12))
#endif /* AVCODEC_DWT_H */ #endif /* AVCODEC_DWT_H */