Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26595214 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge changes I3c40e478,I18003aa2,I16aa3eb0 am: e0d88c4c 

am: e1b58883

* commit 'e1b58883':
  Disable integer sanitization for amrwbenc
  Fix more potential (benign) AMRWB overflows
  Fix more amrwbenc overflows
parents df9e6aaf e1b58883

media/libstagefright/codecs/amrwbenc/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ endif 


LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow

#LOCAL_SANITIZE := signed-integer-overflow



include $(BUILD_STATIC_LIBRARY)
@@ -132,7 +132,7 @@ LOCAL_C_INCLUDES := \ 


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/inc/basic_op.h

+1 −0
Original line number Diff line number Diff line
@@ -608,6 +608,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;

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

+3 −2
Original line number Diff line number Diff line
@@ -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));

    }