From 12604519328867f11511b967565607971234c0ab Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 16 Sep 2014 17:36:55 -0700 Subject: Check for NULL before calling asBinder(). The old asBinder() checked if this == NULL, which is undefined behavior. Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c --- drm/common/IDrmManagerService.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drm') 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 @@ status_t BpDrmManagerService::setDrmServiceListener( 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(); } -- cgit v1.1