commit 12604519328867f11511b967565607971234c0ab
author Dan Albert <danalbert@google.com> Tue Sep 16 17:36:55 2014 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 16 17:36:55 2014 -0700
tree bc2eb096fa3229d8be7b3ea902588ed299a09b27
parent 14fc930d5d2ef272b39342fa083f4097464fc9ea

Check for NULL before calling asBinder().

The old asBinder() checked if this == NULL, which is undefined behavior.

Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c

drm/common/IDrmManagerService.cpp

diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index db41e0b..36cb612 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -148,7 +148,8 @@
 
     data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
     data.writeInt32(uniqueId);
-    data.writeStrongBinder(drmServiceListener->asBinder());
+    data.writeStrongBinder(
+        drmServiceListener != NULL ? drmServiceListener->asBinder() : NULL);
     remote()->transact(SET_DRM_SERVICE_LISTENER, data, &reply);
     return reply.readInt32();
 }