aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2021-04-28 02:35:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-04-28 02:35:44 +0000
commit7477bbdc0ffb428ee47e16a40f2976121b2487aa (patch)
treeaecffb3d8e880ed161f4540b38dc7ad7591b1060
parente2f00ec7ba1fdd44afcbcebe4092fa786043589c (diff)
parentd3504a39aba816e00d11aada7770be1c6e81514e (diff)
downloadtremolo-7477bbdc0ffb428ee47e16a40f2976121b2487aa.tar.gz
Merge "Tremolo: Fix integer overflows in codebook.c"
-rw-r--r--Tremolo/codebook.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 84721e7..5db6b60 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -873,8 +873,11 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a,
if (!v) return -1;
for(i=0;i<n;){
if(decode_map(book,b,v,point))return -1;
- for (j=0;j<book->dim && i < n;j++)
- a[i++]+=v[j];
+ for (j=0;j<book->dim && i < n;j++,i++){
+ if (__builtin_add_overflow(a[i], v[j], &a[i])) {
+ a[i] = v[j] > 0 ? INT32_MAX : INT32_MIN;
+ }
+ }
}
}
return 0;