commit c8a9f4ad35f24ac59645bb262bd8f16fd4f6f0d8
author Chris Thornton <thorntonc@google.com> Mon Feb 06 18:31:42 2017 -0800
committer Chris Thornton <thorntonc@google.com> Wed Feb 08 01:13:55 2017 +0000
tree 2ef88bd1513a4daacee04c0d5ca924d3605aca39
parent db0d4cc3184f400dcbb841f274d5b6f4c8400550

Fix potential null dereference in SoundTriggerHwService

Identified by static analysis as a potential problem.

Test: mmma frameworks/av/services/soundtrigger
Change-Id: If24519faeec260c3d357b369d53d0f68689bdf8a

services/soundtrigger/SoundTriggerHwService.cpp

diff --git a/services/soundtrigger/SoundTriggerHwService.cpp b/services/soundtrigger/SoundTriggerHwService.cpp
index 54f9b95..78845b7 100644
--- a/services/soundtrigger/SoundTriggerHwService.cpp
+++ b/services/soundtrigger/SoundTriggerHwService.cpp
@@ -923,7 +923,10 @@
 
 void SoundTriggerHwService::ModuleClient::onFirstRef()
 {
-    IInterface::asBinder(mClient)->linkToDeath(this);
+    sp<IBinder> binder = IInterface::asBinder(mClient);
+    if (binder != 0) {
+        binder->linkToDeath(this);
+    }
 }
 
 SoundTriggerHwService::ModuleClient::~ModuleClient()