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

Commit ac77b699 authored by David Li's avatar David Li Committed by Automerger Merge Worker
Browse files

Merge "fix null dereference on aeli" am: 00112c5a am: 06b7deb3 am: 5809caff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1646947

Change-Id: Id1535f29a43980bab3117587ffe83b22584a102d
parents 694d2be1 5809caff

media/libeffects/proxy/EffectProxy.cpp

+10 −0
Original line number Diff line number Diff line
@@ -116,6 +116,16 @@ int EffectProxyCreate(const effect_uuid_t *uuid, 
        pContext->sube[SUB_FX_OFFLOAD] = sube[1];

        pContext->desc[SUB_FX_OFFLOAD] = desc[1];

        pContext->aeli[SUB_FX_OFFLOAD] = aeli[1];

    } else {

        ALOGE("Both effects have (or don't have) EFFECT_FLAG_HW_ACC_TUNNEL flag");

        delete[] sube;

        delete[] desc;

        delete[] aeli;

        delete[] pContext->sube;

        delete[] pContext->desc;

        delete[] pContext->aeli;

        delete pContext;

        return -EINVAL;

    }

    delete[] desc;

    delete[] aeli;