commit 5d057106af976cdb2a7b32b26ffb957dff0979f3
author Jeff Tinker <jtinker@google.com> Sat Jun 17 00:41:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 17 00:41:16 2017 +0000
tree 52f8d379fc38b4efb087c45281f6c6c9365291ab
parent fca1a3a377f11933afbdd22c1a3a73f677a22fa4
parent a5f3e42433d79b545647ea8e766a8e5e42816f75

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

Change-Id: Ia35d482b590c286349a4534fecdc8815ed1d1bff

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index e56f675..386546f 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -411,8 +411,11 @@
     }
 
     setListener(NULL);
-    mPlugin->setListener(NULL);
+    if (mPlugin != NULL) {
+        mPlugin->setListener(NULL);
+    }
     mPlugin.clear();
+    mInitCheck = NO_INIT;
 
     return OK;
 }
@@ -960,8 +963,11 @@
 {
     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)