diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-17 09:51:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-17 09:51:31 +0000 |
commit | 16bcd6793e0b8fb8cca01f8d8a23bc7b153da1a3 (patch) | |
tree | dfc8c7ea69673cb3ee76cda2aadc9d6aed54cf97 | |
parent | 2a34f9fb1674b148a1c6f062d4eeef182853a295 (diff) | |
parent | a3db049d695853c552bab755abac14daf21c6af5 (diff) | |
download | tremolo-16bcd6793e0b8fb8cca01f8d8a23bc7b153da1a3.tar.gz |
Snap for 8086475 from a3db049d695853c552bab755abac14daf21c6af5 to mainline-ipsec-releaseandroid-mainline-12.0.0_r88android-mainline-12.0.0_r73android-mainline-12.0.0_r118android-mainline-12.0.0_r103android12-mainline-ipsec-release
Change-Id: I1f18173b89f4b36be940f43902694be96e9c8d39
-rw-r--r-- | Tremolo/codebook.c | 1 | ||||
-rw-r--r-- | Tremolo/floor1.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c index 5a57a71..3c03f28 100644 --- a/Tremolo/codebook.c +++ b/Tremolo/codebook.c @@ -765,6 +765,7 @@ int decode_map(codebook *s, oggpack_buffer *b, ogg_int32_t *v, int point); static int decode_map(codebook *s, oggpack_buffer *b, ogg_int32_t *v, int point){ ogg_uint32_t entry = decode_packed_entry_number(s,b); int i; + if(entry==UINT_MAX)return -1; if(oggpack_eop(b))return(-1); /* 1 used by test file 0 */ diff --git a/Tremolo/floor1.c b/Tremolo/floor1.c index 1a920a7..287ac42 100644 --- a/Tremolo/floor1.c +++ b/Tremolo/floor1.c @@ -373,6 +373,8 @@ ogg_int32_t *floor1_inverse1(vorbis_dsp_state *vd,vorbis_info_floor *in, return(NULL); } +// overflowing calculations not used for indexing +__attribute__((no_sanitize("signed-integer-overflow"))) int floor1_inverse2(vorbis_dsp_state *vd,vorbis_info_floor *in, ogg_int32_t *fit_value,ogg_int32_t *out){ vorbis_info_floor1 *info=(vorbis_info_floor1 *)in; |