commit 2afac0c7c42560ff5b8f133c6074b7e023279d6d
author Wei Jia <wjia@google.com> Thu Jan 07 12:13:07 2016 -0800
committer Wei Jia <wjia@google.com> Thu Jan 07 15:20:31 2016 -0800
tree f541f9d2de183b5b24c857bdf5995845b22efb2b
parent df9e6aaf716279baf0e27b99acf10005924245ed

libmedia: check NULL pointer at binder receiver side.

Change-Id: I464da96f3d6081dd8c3cc2fd977e2b96f5d477bb

media/libmedia/IMediaPlayerService.cpp

diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp
index 05f8670..afc94ab 100644
--- a/media/libmedia/IMediaPlayerService.cpp
+++ b/media/libmedia/IMediaPlayerService.cpp
@@ -220,6 +220,10 @@
             const String16 opPackageName = data.readString16();
             sp<IRemoteDisplayClient> client(
                     interface_cast<IRemoteDisplayClient>(data.readStrongBinder()));
+            if (client == NULL) {
+                reply->writeStrongBinder(NULL);
+                return NO_ERROR;
+            }
             String8 iface(data.readString8());
             sp<IRemoteDisplay> display(listenForRemoteDisplay(opPackageName, client, iface));
             reply->writeStrongBinder(IInterface::asBinder(display));