commit 48da5c7abc87bb68b20efb146094e3a9eb1abd98
author Martijn Coenen <maco@google.com> Thu Jul 06 09:15:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 06 09:15:53 2017 +0000
tree 9ccf5c8deffc4b86f4ad1779907d69b31dedadf9
parent 9fb8fd9160d78e58529eb25bedc6231db10bd687
parent c490b8b7245795cf82e31a852e7f55557d50148c

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

Change-Id: I232c3dfc74fe6f3fbd1c9c2c8becfbed80ec05e0

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() {