diff options
| author | Martijn van Beurden <mvanb1@gmail.com> | 2023-02-21 11:41:42 +0100 |
|---|---|---|
| committer | Martijn van Beurden <mvanb1@gmail.com> | 2023-02-21 15:56:40 +0100 |
| commit | d52921bc0b96c21188aeaeac7193aeb4e1801a19 (patch) | |
| tree | 16f9d0cd479b8f12c3e56e519149fbb1ea49f205 | |
| parent | 8daf62da0c2b65355db384748769b069815c4a84 (diff) | |
| download | flac-d52921bc0b96c21188aeaeac7193aeb4e1801a19.tar.gz | |
Disable signed int overflow sanitizer in hotspots by default
See https://github.com/xiph/flac/issues/546
| -rw-r--r-- | src/libFLAC/fixed.c | 4 | ||||
| -rw-r--r-- | src/libFLAC/lpc.c | 4 | ||||
| -rw-r--r-- | src/libFLAC/stream_decoder.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libFLAC/fixed.c b/src/libFLAC/fixed.c index da5c7dac..99f1da96 100644 --- a/src/libFLAC/fixed.c +++ b/src/libFLAC/fixed.c @@ -560,7 +560,7 @@ void FLAC__fixed_compute_residual_wide_33bit(const FLAC__int64 data[], uint32_t } } -#ifdef FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && !defined(FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW) /* The attribute below is to silence the undefined sanitizer of oss-fuzz. * Because fuzzing feeds bogus predictors and residual samples to the * decoder, having overflows in this section is unavoidable. Also, @@ -628,7 +628,7 @@ void FLAC__fixed_restore_signal_wide(const FLAC__int32 residual[], uint32_t data } } -#ifdef FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && !defined(FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW) /* The attribute below is to silence the undefined sanitizer of oss-fuzz. * Because fuzzing feeds bogus predictors and residual samples to the * decoder, having overflows in this section is unavoidable. Also, diff --git a/src/libFLAC/lpc.c b/src/libFLAC/lpc.c index 9d9c7e3b..7c16cdf6 100644 --- a/src/libFLAC/lpc.c +++ b/src/libFLAC/lpc.c @@ -964,7 +964,7 @@ uint32_t FLAC__lpc_max_residual_bps(uint32_t subframe_bps, const FLAC__int32 * f return predictor_sum_bps + 1; } -#ifdef FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && !defined(FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW) /* The attribute below is to silence the undefined sanitizer of oss-fuzz. * Because fuzzing feeds bogus predictors and residual samples to the * decoder, having overflows in this section is unavoidable. Also, @@ -1487,7 +1487,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 * flac_restrict residual, u } #endif -#ifdef FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && !defined(FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW) /* The attribute below is to silence the undefined sanitizer of oss-fuzz. * Because fuzzing feeds bogus predictors and residual samples to the * decoder, having overflows in this section is unavoidable. Also, diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index d585baf5..34919c37 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -3070,7 +3070,7 @@ FLAC__bool read_callback_(FLAC__byte buffer[], size_t *bytes, void *client_data) */ } -#ifdef FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && !defined(FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW) /* The attribute below is to silence the undefined sanitizer of oss-fuzz. * Because fuzzing feeds bogus predictors and residual samples to the * decoder, having overflows in this section is unavoidable. Also, |