commit fc12902fc75d31d1ace4a00b608e63a699528bab
author Martijn Coenen <maco@google.com> Thu Jul 06 09:11:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 06 09:11:27 2017 +0000
tree 0511c1a613ff83eac502947e97cfe78253cbcc59
parent e06b744b3db0779565f194e1147dbb5bf6c7128e
parent 25508806b87fc4d428590f06e0b6d361a254355c

Fix proxy memory leak.
am: 25508806b8

Change-Id: I3595ec43463190457c17e883ec5c1e224cf0ccb8

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