commit 45f6f0c5773e5e1d213d31f3573715a11ff27c2c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 13 19:22:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 13 19:22:24 2021 +0000
tree bc7e6313c847b37e363e59fc34cd360183c635cf
parent 3f06080d98d036a5373eb97ff341a0d753355d06
parent 9e9b78083fe22c28b07488d3eff07564ba271890

Merge "Tremolo: Fix integer overflows in codebook.c"

Tremolo/codebook.c

diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 2fbb392..8e7d4eb 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -858,8 +858,11 @@
 
     for (j=0;j<step;j++){
       if(decode_map(book,b,v,point))return -1;
-      for(i=0,o=j;i<book->dim;i++,o+=step)
-        a[o]+=v[i];
+      for(i=0,o=j;i<book->dim;i++,o+=step){
+        if (__builtin_add_overflow(a[o], v[i], &a[o])){
+           a[o] = v[i] > 0 ? INT32_MAX : INT32_MIN;
+        }
+      }
     }
   }
   return 0;
@@ -926,7 +929,10 @@
     for(i=offset;i<offset+n;){
       if(decode_map(book,b,v,point))return -1;
       for (j=0;j<book->dim && i < offset + n;j++){
-        a[chptr++][i]+=v[j];
+        if (__builtin_add_overflow(a[chptr][i], v[j], &a[chptr][i])) {
+           a[chptr][i] = v[j] > 0 ? INT32_MAX : INT32_MIN;
+        }
+        chptr++;
         if(chptr==ch){
           chptr=0;
           i++;