Browse Source

avcodec/dirac_dwt: Fix several integer overflows

Fixes: runtime error: signed integer overflow: -2146071175 + -268479557 cannot be represented in type 'int'
Fixes: 5237/clusterfuzz-testcase-minimized-4569895275593728

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 fe1e6c06d0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3.7
Michael Niedermayer 7 years ago
parent
commit
55f9c21363
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      libavcodec/dirac_dwt.h
  2. +1
    -1
      libavcodec/dirac_dwt_template.c

+ 2
- 2
libavcodec/dirac_dwt.h View File

@@ -93,10 +93,10 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);

// shared stuff for simd optimizations
#define COMPOSE_53iL0(b0, b1, b2)\
(b1 - ((int)(b0 + (unsigned)(b2) + 2) >> 2))
(b1 - (unsigned)((int)(b0 + (unsigned)(b2) + 2) >> 2))

#define COMPOSE_DIRAC53iH0(b0, b1, b2)\
(b1 + ((int)(b0 + (unsigned)(b2) + 1) >> 1))
(b1 + (unsigned)((int)(b0 + (unsigned)(b2) + 1) >> 1))

#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\
(int)(((unsigned)(b2) + ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 8) >> 4)))


+ 1
- 1
libavcodec/dirac_dwt_template.c View File

@@ -49,7 +49,7 @@ static void RENAME(vertical_compose53iL0)(uint8_t *_b0, uint8_t *_b1, uint8_t *_
TYPE *b1 = (TYPE *)_b1;
TYPE *b2 = (TYPE *)_b2;
for (i = 0; i < width; i++)
b1[i] -= (int)(b0[i] + (unsigned)b2[i] + 2) >> 2;
b1[i] -= (unsigned)((int)(b0[i] + (unsigned)b2[i] + 2) >> 2);
}

static av_always_inline void RENAME(interleave)(TYPE *dst, TYPE *src0, TYPE *src1, int w2,


Loading…
Cancel
Save