mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
avutil/tx_priv: Use unsigned in BF() to avoid signed overflows
Fixes: signed integer overflow: 100183269 - -2132769113 cannot be represented in type 'int' Fixes: 55063/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5039294027005952 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:
parent
014c02d43b
commit
eddf7e2a3e
@ -102,6 +102,12 @@ typedef void TXComplex;
|
|||||||
|
|
||||||
#define FOLD(a, b) ((a) + (b))
|
#define FOLD(a, b) ((a) + (b))
|
||||||
|
|
||||||
|
#define BF(x, y, a, b) \
|
||||||
|
do { \
|
||||||
|
x = (a) - (b); \
|
||||||
|
y = (a) + (b); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
#elif defined(TX_INT32)
|
#elif defined(TX_INT32)
|
||||||
|
|
||||||
/* Properly rounds the result */
|
/* Properly rounds the result */
|
||||||
@ -132,14 +138,14 @@ typedef void TXComplex;
|
|||||||
|
|
||||||
#define FOLD(x, y) ((int32_t)((x) + (unsigned)(y) + 32) >> 6)
|
#define FOLD(x, y) ((int32_t)((x) + (unsigned)(y) + 32) >> 6)
|
||||||
|
|
||||||
#endif /* TX_INT32 */
|
|
||||||
|
|
||||||
#define BF(x, y, a, b) \
|
#define BF(x, y, a, b) \
|
||||||
do { \
|
do { \
|
||||||
x = (a) - (b); \
|
x = (a) - (unsigned)(b); \
|
||||||
y = (a) + (b); \
|
y = (a) + (unsigned)(b); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
#endif /* TX_INT32 */
|
||||||
|
|
||||||
#define CMUL3(c, a, b) CMUL((c).re, (c).im, (a).re, (a).im, (b).re, (b).im)
|
#define CMUL3(c, a, b) CMUL((c).re, (c).im, (a).re, (a).im, (b).re, (b).im)
|
||||||
|
|
||||||
/* Codelet flags, used to pick codelets. Must be a superset of enum AVTXFlags,
|
/* Codelet flags, used to pick codelets. Must be a superset of enum AVTXFlags,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user