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

am: a5f3e42433 Change-Id: Ie563efbf3b0558b89cf3b4d07eec457d307dff70
7 years ago · 8cccead54b
parent c7bf276807 a5f3e42433
commit 8cccead54b
1 changed files with 8 additions and 2 deletions
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@ -411,8 +411,11 @@ status_t DrmHal::destroyPlugin() {
    }

    setListener(NULL);
-    mPlugin->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);
-    mPlugin->setListener(NULL);
+    if (mPlugin != NULL) {
+        mPlugin->setListener(NULL);
+    }
    mPlugin.clear();
+    mInitCheck = NO_INIT;
 }

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