From 8f64134f749e4f7861a08a3063450fc714c4651d Mon Sep 17 00:00:00 2001
From: Gloria Wang <gwang@google.com>
Date: Tue, 8 Feb 2011 13:24:08 -0800
Subject: Add more check before using the DRM manager client.

Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
---
 media/libstagefright/AwesomePlayer.cpp    | 9 ++++++---
 media/libstagefright/DRMExtractor.cpp     | 1 +
 media/libstagefright/FileSource.cpp       | 1 +
 media/libstagefright/NuHTTPDataSource.cpp | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'media')

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 5a43c6a..2f5a202 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -291,9 +291,11 @@ status_t AwesomePlayer::setDataSource_l(
     }
 
     dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient);
-    if (mDecryptHandle != NULL
-            && RightsStatus::RIGHTS_VALID != mDecryptHandle->status) {
-        notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE);
+    if (mDecryptHandle != NULL) {
+        CHECK(mDrmManagerClient);
+        if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) {
+            notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE);
+        }
     }
 
     return setDataSource_l(extractor);
@@ -1738,6 +1740,7 @@ status_t AwesomePlayer::finishSetDataSource_l() {
 
     dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient);
     if (mDecryptHandle != NULL) {
+        CHECK(mDrmManagerClient);
         if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) {
             if (DecryptApiType::WV_BASED == mDecryptHandle->decryptApiType) {
                 LOGD("Setting mCachedSource to NULL for WVM\n");
diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp
index 4b83568..647cf43 100644
--- a/media/libstagefright/DRMExtractor.cpp
+++ b/media/libstagefright/DRMExtractor.cpp
@@ -79,6 +79,7 @@ DRMSource::DRMSource(const sp<MediaSource> &mediaSource,
       mTrackId(trackId),
       mNALLengthSize(0),
       mWantsNALFragments(false) {
+    CHECK(mDrmManagerClient);
     mDrmManagerClient->initializeDecryptUnit(
             mDecryptHandle, trackId, ipmpBox);
 
diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp
index b8e75fd..02a78c9 100644
--- a/media/libstagefright/FileSource.cpp
+++ b/media/libstagefright/FileSource.cpp
@@ -63,6 +63,7 @@ FileSource::~FileSource() {
 
     if (mDecryptHandle != NULL) {
         // To release mDecryptHandle
+        CHECK(mDrmManagerClient);
         mDrmManagerClient->closeDecryptSession(mDecryptHandle);
         mDecryptHandle = NULL;
     }
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp
index af04f93..0376e1c 100644
--- a/media/libstagefright/NuHTTPDataSource.cpp
+++ b/media/libstagefright/NuHTTPDataSource.cpp
@@ -81,6 +81,7 @@ NuHTTPDataSource::NuHTTPDataSource()
 NuHTTPDataSource::~NuHTTPDataSource() {
     if (mDecryptHandle != NULL) {
         // To release mDecryptHandle
+        CHECK(mDrmManagerClient);
         mDrmManagerClient->closeDecryptSession(mDecryptHandle);
         mDecryptHandle = NULL;
     }
-- 
cgit v1.1