commit 0383876fc5d02f35e05e5c41e0b2335dcdcc2d41
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 30 22:31:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 30 22:31:11 2016 +0000
tree a0454a35ada91aaf3c21a67314266625f2c7da30
parent 00c553db3e9c486b016fa030be00f5b53c6b0b8e
parent 1b5a7ee3fdc33ee584a88580171fbad154e10f5d

Merge "Check service binders before dereferencing them"

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 95c91d1..d45dbcd 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -684,10 +684,18 @@
 
     sp<IServiceManager> sm = defaultServiceManager();
     sp<IBinder> binder = sm->getService(String16("media.extractor"));
+    if (binder == NULL) {
+        ALOGE("extractor service not available");
+        return NULL;
+    }
     mExtractorDeathListener = new ServiceDeathNotifier(binder, p, MEDIAEXTRACTOR_PROCESS_DEATH);
     binder->linkToDeath(mExtractorDeathListener);
 
     binder = sm->getService(String16("media.codec"));
+    if (binder == NULL) {
+        ALOGE("codec service not available");
+        return NULL;
+    }
     mCodecDeathListener = new ServiceDeathNotifier(binder, p, MEDIACODEC_PROCESS_DEATH);
     binder->linkToDeath(mCodecDeathListener);