Merge "Check for drmhal plugin null pointer deref" into oc-dev (8cccead5) · Commits · e / devices / smdk4412 / android_frameworks_av

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)