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

Commit a5f3e424 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 514a9ffc 70367f52

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)