diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-01-24 22:56:43 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-01-24 22:56:43 +0000 |
commit | 632704bab32e1c0362a0e3b698d2f3f773ee9ee1 (patch) | |
tree | 8197fb78a3c98ac05fcc62ce1fff924d806ebd73 | |
parent | add22ecca3fd0c708d3feced9881b380459f2314 (diff) | |
parent | bc4bde3bee34b9bbe439dd24d1d5dfacd9ee0c2b (diff) | |
download | tremolo-632704bab32e1c0362a0e3b698d2f3f773ee9ee1.tar.gz |
[automerger] Add some error/overflow checks in codebook handling am: 6eb63e1192 am: bc4bde3bee
Change-Id: I63d8720dc2f7a4aa33cb78a1ef3a38bd39d145d4
-rw-r--r-- | Tremolo/codebook.c | 17 |
1 files changed, 12 insertions, 5 deletions
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 _book_maptype1_quantvals(codebook *b){ 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++; |