Add some error/overflow checks in codebook handling
Bug: 119120561
Test: manual
Change-Id: I2476ef29d81a8335fdcbdbbaa175a575138d4039
(cherry picked from commit b5e041da6bfe79b5ee5fb48374cd753df6d18015)
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++;