commit 7c06aae74f60d19be81b4d256dd5806b44c5011e
author Xin Li <delphij@google.com> Tue Apr 09 04:29:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 09 04:29:22 2019 +0000
tree 93d6e675ce1c03ffc247a6335b4178594a25324d
parent 50785801b50ac1045704e419e7298707023df023
parent 3dd6c7d1508f60cd83d919f86c819a8a7903df2f

Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master"

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++;