commit 81f8b15dd98f2bc62ee3d77211ac09a71bbc7578
author Eric Laurent <elaurent@google.com> Mon Jan 25 11:40:47 2016 -0800
committer Marco Nelissen <marcone@google.com> Tue Jan 26 14:16:16 2016 -0800
tree 22a7e1b73067b2b6e859ec1d3122289cbb813424
parent 47dabd38252860dd70b83380fc3df0f84a7ede49

Revert "Disable integer sanitization for amrwbenc"

Fix some more overflows, and turn sanitize back on.

Bug: 26416048
Change-Id: I17d3b8a975770c6b5778610c1ff7928fce598e21

media/libstagefright/codecs/amrwbenc/Android.mk

diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk
index 4d12f82..77a7b1e 100644
--- a/media/libstagefright/codecs/amrwbenc/Android.mk
+++ b/media/libstagefright/codecs/amrwbenc/Android.mk
@@ -102,7 +102,7 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-#LOCAL_SANITIZE := signed-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -120,7 +120,7 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-#LOCAL_SANITIZE := signed-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_amrwbenc

media/libstagefright/codecs/amrwbenc/src/c4t64fx.c

diff --git a/media/libstagefright/codecs/amrwbenc/src/c4t64fx.c b/media/libstagefright/codecs/amrwbenc/src/c4t64fx.c
index b9a9e26..e3b2f6c 100644
--- a/media/libstagefright/codecs/amrwbenc/src/c4t64fx.c
+++ b/media/libstagefright/codecs/amrwbenc/src/c4t64fx.c
@@ -1014,8 +1014,8 @@
             {
                 ps2 = add1(ps1, dn[y]);
 
-                alp2 = alp1 + ((*p1++)<<13);
-                alp2 = alp2 + ((*p2++)<<14);
+                alp2 = L_add(alp1, ((*p1++)<<13));
+                alp2 = L_add(alp2, ((*p2++)<<14));
                 alp_16 = extract_h(alp2);
                 sq = vo_mult(ps2, ps2);
                 s = vo_L_mult(alpk, sq) - ((sqk * alp_16)<<1);