commit 91e66f9ba18f3d053859c58d6af97cdd4f79579b
author Steven Moreland <smoreland@google.com> Fri Mar 15 16:32:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 15 16:32:37 2019 +0000
tree c7332eb61f5c2fee83957df6511ec41a45800a06
parent cd3d535d383b726c3653410b31faa0866ef79511
parent e88055bb15b9157234fc33aa46516da0b4591da7

Merge "libbinder_ndk: fix UB memory access for race"

libs/binder/ndk/ibinder_internal.h

diff --git a/libs/binder/ndk/ibinder_internal.h b/libs/binder/ndk/ibinder_internal.h
index 0dd795a..202d6d2 100644
--- a/libs/binder/ndk/ibinder_internal.h
+++ b/libs/binder/ndk/ibinder_internal.h
@@ -133,7 +133,7 @@
     // binderDied receipt only gives us information about the IBinder.
     struct TransferDeathRecipient : ::android::IBinder::DeathRecipient {
         TransferDeathRecipient(const ::android::wp<::android::IBinder>& who, void* cookie,
-                               const AIBinder_DeathRecipient_onBinderDied& onDied)
+                               const AIBinder_DeathRecipient_onBinderDied onDied)
             : mWho(who), mCookie(cookie), mOnDied(onDied) {}
 
         void binderDied(const ::android::wp<::android::IBinder>& who) override;
@@ -144,7 +144,7 @@
        private:
         ::android::wp<::android::IBinder> mWho;
         void* mCookie;
-        const AIBinder_DeathRecipient_onBinderDied& mOnDied;
+        const AIBinder_DeathRecipient_onBinderDied mOnDied;
     };
 
     explicit AIBinder_DeathRecipient(AIBinder_DeathRecipient_onBinderDied onDied);