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

Commit 5ddd768e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: fix nullptr deref at initiateReleaseIfStuck" into sc-dev am: ffa4219d 

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

Change-Id: Ibbc0cd9897d285a2bc411ad3050601fdbc019223
parents 11c992e9 ffa4219d

media/codec2/sfplugin/CCodec.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -2441,6 +2441,11 @@ void CCodec::initiateReleaseIfStuck() { 
    C2String compName;

    C2String compName;

    {

    {

        Mutexed<State>::Locked state(mState);

        Mutexed<State>::Locked state(mState);

        if (!state->comp) {

            ALOGD("previous call to %s exceeded timeout "

                  "and the component is already released", name.c_str());

            return;

        }

        compName = state->comp->getName();

        compName = state->comp->getName();

    }

    }

    ALOGW("[%s] previous call to %s exceeded timeout", compName.c_str(), name.c_str());

    ALOGW("[%s] previous call to %s exceeded timeout", compName.c_str(), name.c_str());