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

Commit 5d057106 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Check for drmhal plugin null pointer deref" into oc-dev 

am: a5f3e424

Change-Id: Ia35d482b590c286349a4534fecdc8815ed1d1bff
parents fca1a3a3 a5f3e424

drm/libmediadrm/DrmHal.cpp

+8 −2
Original line number Diff line number Diff line
@@ -411,8 +411,11 @@ status_t DrmHal::destroyPlugin() { 
    }



    setListener(NULL);

    if (mPlugin != NULL) {

        mPlugin->setListener(NULL);

    }

    mPlugin.clear();

    mInitCheck = NO_INIT;



    return OK;

}
@@ -960,8 +963,11 @@ void DrmHal::binderDied(const wp<IBinder> &the_late_who __unused) 
{

    Mutex::Autolock autoLock(mLock);

    setListener(NULL);

    if (mPlugin != NULL) {

        mPlugin->setListener(NULL);

    }

    mPlugin.clear();

    mInitCheck = NO_INIT;

}



void DrmHal::writeByteArray(Parcel &obj, hidl_vec<uint8_t> const &vec)