commit 24fe60af8823f894d65f582285223294f886e419
author Martijn Coenen <maco@google.com> Thu Jul 06 09:17:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 06 09:17:11 2017 +0000
tree 9ccf5c8deffc4b86f4ad1779907d69b31dedadf9
parent 509d9ddebe59f1a1aa3865dd97ebc6af3f8bcc29
parent 48da5c7abc87bb68b20efb146094e3a9eb1abd98

Fix proxy memory leak. am: 25508806b8 am: fc12902fc7 am: c490b8b724
am: 48da5c7abc

Change-Id: I518fec4f298b55fcceee8106afc71ff3c2e001c2

transport/HidlBinderSupport.cpp

diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp
index d293542..fe1ccbc 100644
--- a/transport/HidlBinderSupport.cpp
+++ b/transport/HidlBinderSupport.cpp
@@ -35,9 +35,10 @@
 
 void hidl_binder_death_recipient::binderDied(const wp<IBinder>& /*who*/) {
     sp<hidl_death_recipient> recipient = mRecipient.promote();
-    if (recipient != nullptr) {
+    if (recipient != nullptr && mBase != nullptr) {
         recipient->serviceDied(mCookie, mBase);
     }
+    mBase = nullptr;
 }
 
 wp<hidl_death_recipient> hidl_binder_death_recipient::getRecipient() {