commit adc4d9c86d45376a3936a67616c2a302f08b5f21
author Gloria Wang <gwang@google.com> Tue Feb 08 13:24:08 2011 -0800
committer Gloria Wang <gwang@google.com> Tue Feb 08 13:25:27 2011 -0800
tree 75cc0286685c1b1c62d1c5fa0b8bfac0a8d5f402
parent 4a4bf2211634b87c862e02b95d97eaa8b43819d2

Add more check before using the DRM manager client.

Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652

media/libstagefright/AwesomePlayer.cpp

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 @@
     }
 
     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 @@
 
     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");

media/libstagefright/DRMExtractor.cpp

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 @@
       mTrackId(trackId),
       mNALLengthSize(0),
       mWantsNALFragments(false) {
+    CHECK(mDrmManagerClient);
     mDrmManagerClient->initializeDecryptUnit(
             mDecryptHandle, trackId, ipmpBox);
 

media/libstagefright/FileSource.cpp

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 @@
 
     if (mDecryptHandle != NULL) {
         // To release mDecryptHandle
+        CHECK(mDrmManagerClient);
         mDrmManagerClient->closeDecryptSession(mDecryptHandle);
         mDecryptHandle = NULL;
     }

media/libstagefright/NuHTTPDataSource.cpp

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() {
     if (mDecryptHandle != NULL) {
         // To release mDecryptHandle
+        CHECK(mDrmManagerClient);
         mDrmManagerClient->closeDecryptSession(mDecryptHandle);
         mDecryptHandle = NULL;
     }