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

Commit 97b84c6b authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into qt-dev 

am: 40e57410

Change-Id: I1454dc681f45c7542e87ae0be44b6b2e086f9ab6
parents 9f4fb56f 40e57410

media/libstagefright/codecs/amrwbenc/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ cc_library_static { 


    shared_libs: [

        "libstagefright_enc_common",

        "liblog",

    ],



    cflags: ["-Werror"],

media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ cc_test { 


    shared_libs: [

        "libdl",

        "liblog",

    ],



    static_libs: [

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

+11 −2
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 


#include "q_pulse.h"



#undef LOG_TAG

#define LOG_TAG "amrwbenc"

#include "log/log.h"



static Word16 tipos[36] = {

    0, 1, 2, 3,                            /* starting point &ipos[0], 1st iter */

    1, 2, 3, 0,                            /* starting point &ipos[4], 2nd iter */
@@ -745,11 +749,16 @@ void ACELP_4t64_fx( 


        i = (Word16)((vo_L_mult(track, NPMAXPT) >> 1));



        while (ind[i] >= 0)

        while (i < NPMAXPT * NB_TRACK && ind[i] >= 0)

        {

            i += 1;

        }

        if (i < NPMAXPT * NB_TRACK) {

            ind[i] = index;

        } else {

            ALOGE("b/132647222, OOB access in ind array track=%d i=%d", track, i);

            android_errorWriteLog(0x534e4554, "132647222");

        }

    }



    k = 0;