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

Commit 8fe7b84f 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: I98ea53c098e4bb339c9fa9b0355da1783137ced5
parents 15d806da ffa4219d

media/codec2/sfplugin/CCodec.cpp

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

    {

        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();

    }

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