From b5ce361d19e69fe156f7188c9ee0f4734b259874 Mon Sep 17 00:00:00 2001
From: Gloria Wang <gwang@google.com>
Date: Thu, 24 Feb 2011 16:40:57 -0800
Subject: Fix for bug 3477330 This patch fixs a crash bug caused by using a
 NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead.

Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
---
 media/libstagefright/FileSource.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'media/libstagefright/FileSource.cpp')

diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp
index 02a78c9..f2f3500 100644
--- a/media/libstagefright/FileSource.cpp
+++ b/media/libstagefright/FileSource.cpp
@@ -125,7 +125,7 @@ status_t FileSource::getSize(off64_t *size) {
     return OK;
 }
 
-DecryptHandle* FileSource::DrmInitialization() {
+sp<DecryptHandle> FileSource::DrmInitialization() {
     if (mDrmManagerClient == NULL) {
         mDrmManagerClient = new DrmManagerClient();
     }
@@ -147,8 +147,8 @@ DecryptHandle* FileSource::DrmInitialization() {
     return mDecryptHandle;
 }
 
-void FileSource::getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {
-    *handle = mDecryptHandle;
+void FileSource::getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client) {
+    handle = mDecryptHandle;
 
     *client = mDrmManagerClient;
 }
-- 
cgit v1.1