commit 7431d3c2a71a315f47c9e86e9ad691e9278b2114
author Marco Nelissen <marcone@google.com> Wed Jan 23 16:10:48 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Feb 19 22:39:16 2019 +0000
tree 4a1e275c60ecb8f5ed0bedb49be38e65ab872472
parent ae82e79b010e02b96e6a1306ce7308f1c953d4c2

Add some error/overflow checks in codebook handling

Bug: 119120561
Test: manual
Change-Id: I2476ef29d81a8335fdcbdbbaa175a575138d4039
(cherry picked from commit b5e041da6bfe79b5ee5fb48374cd753df6d18015)
(cherry picked from commit 6eb63e119294ba92f93f03bbda6c4b203f0f87bb)

Tremolo/codebook.c

diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 467640d..a06302d 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -376,14 +376,21 @@
     long acc=1;
     long acc1=1;
     int i;
-    for(i=0;i<b->dim;i++){
-      acc*=vals;
-      acc1*=vals+1;
+    for (i = 0; i < b->dim; i++) {
+      if (acc > b->entries / vals) {
+          break;
+      }
+      acc *= vals;
+      if (acc1 > LONG_MAX / (vals + 1)) {
+        acc1 = LONG_MAX;
+      } else {
+        acc1 *= (vals + 1);
+      }
     }
-    if(acc<=b->entries && acc1>b->entries){
+    if (i >= b->dim && acc <= b->entries && acc1 > b->entries) {
       return(vals);
     }else{
-      if(acc>b->entries){
+      if (i < b->dim || acc > b->entries) {
         vals--;
       }else{
         vals++;