diff options
| author | Marco Nelissen <marcone@google.com> | 2016-01-05 11:24:52 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-01-08 21:00:25 -0800 |
| commit | 8c4d014e2919992584625cc15c0e0b10e30388fe (patch) | |
| tree | e1de8f047ab98b349314a4679d23599f20a0c7d0 | |
| parent | a6e3ed3215d4964586512483895fd8e4f9d75462 (diff) | |
| download | frameworks_av-8c4d014e2919992584625cc15c0e0b10e30388fe.zip frameworks_av-8c4d014e2919992584625cc15c0e0b10e30388fe.tar.gz frameworks_av-8c4d014e2919992584625cc15c0e0b10e30388fe.tar.bz2 | |
Fix more potential (benign) AMRWB overflows
Bug: 25843966
Change-Id: I18003aa20be1ff0a93473ecd8b4995861bed8c89
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/inc/basic_op.h | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/updt_tar.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h index e63a55a..87d7ec6 100644 --- a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h +++ b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h @@ -607,6 +607,7 @@ static_vo Word32 L_add (Word32 L_var1, Word32 L_var2) |___________________________________________________________________________| */ +__attribute__((no_sanitize("integer"))) static_vo Word32 L_sub (Word32 L_var1, Word32 L_var2) { Word32 L_var_out; diff --git a/media/libstagefright/codecs/amrwbenc/src/updt_tar.c b/media/libstagefright/codecs/amrwbenc/src/updt_tar.c index f312ca3..ba7c2ff 100644 --- a/media/libstagefright/codecs/amrwbenc/src/updt_tar.c +++ b/media/libstagefright/codecs/amrwbenc/src/updt_tar.c @@ -33,12 +33,13 @@ void Updt_tar( ) { Word32 i; - Word32 L_tmp; + Word32 L_tmp, L_tmp2; for (i = 0; i < L; i++) { L_tmp = x[i] << 15; - L_tmp -= (y[i] * gain)<<1; + L_tmp2 = L_mult(y[i], gain); + L_tmp = L_sub(L_tmp, L_tmp2); x2[i] = extract_h(L_shl2(L_tmp, 1)); } |