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

Commit 67c3e635 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 

am: 8cccead5

Change-Id: Iba84148eb309ed5e6466b2c7dd31a8c365eedb8b
parents c0918f78 8cccead5

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)