[FFmpeg-devel] [PATCH 1/2] avcodec/diracdsp: Fix integer anomaly in dequant_subband_*
Michael Niedermayer
michael at niedermayer.cc
Sat Jul 18 23:47:26 EEST 2020
Fixes: negation of -2147483648 cannot be represented in type 'int32_t' (aka 'int'); cast to an unsigned type to negate this value to itself
Fixes: 23760/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-604209011412172
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/diracdsp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c
index 2dd56f83f3..4e08d3817e 100644
--- a/libavcodec/diracdsp.c
+++ b/libavcodec/diracdsp.c
@@ -198,9 +198,9 @@ static void dequant_subband_ ## PX ## _c(uint8_t *src, uint8_t *dst, ptrdiff_t s
PX c, sign, *src_r = (PX *)src, *dst_r = (PX *)dst; \
for (i = 0; i < tot_h; i++) { \
c = *src_r++; \
- sign = FFSIGN(c)*(!!c); \
- c = (FFABS(c)*(unsigned)qf + qs) >> 2; \
- *dst_r++ = c*sign; \
+ if (c < 0) c = -((-(unsigned)c*qf + qs) >> 2); \
+ else if(c > 0) c = (( (unsigned)c*qf + qs) >> 2); \
+ *dst_r++ = c; \
} \
src += tot_h << (sizeof(PX) >> 1); \
dst += stride; \
--
2.17.1
More information about the ffmpeg-devel
mailing list