| commit | 23fb614a3c59a27071d2970d8bc13e939b4d2b81 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 05 11:24:52 2016 -0800 |
| committer | Raleigh Matlock <raleighman2@gmail.com> | Tue Jan 12 09:01:54 2016 -0500 |
| tree | d059370d587658402e3a04bee3d5bfee17bb926b | |
| parent | 05fa1ea129c2a10af45d455c59806161ae3a3ef8 [diff] |
Fix more potential (benign) AMRWB overflows Bug: 25843966 Change-Id: I18003aa20be1ff0a93473ecd8b4995861bed8c89
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 @@ |___________________________________________________________________________| */ +__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 @@ ) { 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)); }