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

Commit 7782d45a authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Suppress bogus static analysis warnings." am: 9d431cef am: ed7b73a5 

am: e05d9deb

Change-Id: Ice7a2f855e881d11f72f61d021b4fa828db5ddb0
parents fc084aa3 e05d9deb

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1198,13 +1198,7 @@ void LvmEffect_free(EffectContext *pContext){ 
    for (int i=0; i<LVM_NR_MEMORY_REGIONS; i++){

        if (MemTab.Region[i].Size != 0){

            if (MemTab.Region[i].pBaseAddress != NULL){

                ALOGV("\tLvmEffect_free - START freeing %" PRIu32 " bytes for region %u at %p\n",

                        MemTab.Region[i].Size, i, MemTab.Region[i].pBaseAddress);



                free(MemTab.Region[i].pBaseAddress);



                ALOGV("\tLvmEffect_free - END   freeing %" PRIu32 " bytes for region %u at %p\n",

                        MemTab.Region[i].Size, i, MemTab.Region[i].pBaseAddress);

            }else{

                ALOGV("\tLVM_ERROR : LvmEffect_free - trying to free with NULL pointer %" PRIu32

                        " bytes for region %u at %p ERROR\n",

media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp

+0 −6
Original line number Diff line number Diff line
@@ -612,13 +612,7 @@ void Reverb_free(ReverbContext *pContext){ 
    for (int i=0; i<LVM_NR_MEMORY_REGIONS; i++){

        if (MemTab.Region[i].Size != 0){

            if (MemTab.Region[i].pBaseAddress != NULL){

                ALOGV("\tfree() - START freeing %" PRIu32 " bytes for region %u at %p\n",

                        MemTab.Region[i].Size, i, MemTab.Region[i].pBaseAddress);



                free(MemTab.Region[i].pBaseAddress);



                ALOGV("\tfree() - END   freeing %" PRIu32 " bytes for region %u at %p\n",

                        MemTab.Region[i].Size, i, MemTab.Region[i].pBaseAddress);

            }else{

                ALOGV("\tLVM_ERROR : free() - trying to free with NULL pointer %" PRIu32 " bytes "

                        "for region %u at %p ERROR\n",

media/libeffects/preprocessing/PreProcessing.cpp

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ error: 
        delete session->procFrame;

        session->procFrame = NULL;

        delete session->apm;

        session->apm = NULL;

        session->apm = NULL; // NOLINT(clang-analyzer-cplusplus.NewDelete)

    }

    return status;

}