diff options
| author | Neelkamal Semwal <neelkamal.semwal@ittiam.com> | 2021-09-28 18:46:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-28 18:46:05 +0000 |
| commit | 25204e35d450c86ae547cba5342febc566a89f14 (patch) | |
| tree | 310b5d2baaa76529aa2b0aa83f6fa5a527caae74 | |
| parent | 4575ee3590a1eab012eea4e0bb248d462c3e0298 (diff) | |
| parent | bdf35d57f418ab61019344513006fe39a181e078 (diff) | |
| download | libopus-25204e35d450c86ae547cba5342febc566a89f14.tar.gz | |
libOpus: fix integer overflow in silk_resampler_down2_hp am: 98ec800bdf am: fd1465e039 am: bdf35d57f4
Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/1767386
Change-Id: Iadf1e24005ca17374c4b7cfc0be3a183dcba5524
| -rw-r--r-- | src/analysis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/analysis.c b/src/analysis.c index 058328f0..8b4f22d0 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -149,7 +149,10 @@ static opus_val32 silk_resampler_down2_hp( out32_hp = ADD32( out32_hp, X ); S[ 2 ] = ADD32( -in32, X ); - hp_ener += out32_hp*(opus_val64)out32_hp; + if(__builtin_add_overflow(hp_ener, out32_hp*(opus_val64)out32_hp, &hp_ener)) + { + hp_ener = UINT64_MAX; + } /* Add, convert back to int16 and store to output */ out[ k ] = HALF32(out32); } |