diff options
| author | Ray Essick <essick@google.com> | 2021-04-28 03:30:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 03:30:31 +0000 |
| commit | 28a2a35c81ec9c046a207b379379e8ef32bcc4dd (patch) | |
| tree | d42243c63dea733c4e8fc680dfe4ed9bf0bb4efb | |
| parent | 28d0580451fa09878c189792286613412807af0c (diff) | |
| parent | 3b325558c0788ea19fcbab51b4b3dc6758d26ffe (diff) | |
| download | tremolo-28a2a35c81ec9c046a207b379379e8ef32bcc4dd.tar.gz | |
Merge "Tremolo: Fix integer overflows in codebook.c" am: 7477bbdc0f am: 3b325558c0
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1652222
Change-Id: I47ba4d26b6ce1be0af84809f165551f3c4e6a868
| -rw-r--r-- | Tremolo/codebook.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c index 43c4917..2fbb392 100644 --- a/Tremolo/codebook.c +++ b/Tremolo/codebook.c @@ -874,8 +874,11 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, if (!v) return -1; for(i=0;i<n;){ if(decode_map(book,b,v,point))return -1; - for (j=0;j<book->dim && i < n;j++) - a[i++]+=v[j]; + for (j=0;j<book->dim && i < n;j++,i++){ + if (__builtin_add_overflow(a[i], v[j], &a[i])) { + a[i] = v[j] > 0 ? INT32_MAX : INT32_MIN; + } + } } } return 0; |