summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-03-15 16:32:37 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-03-15 16:32:37 +0000
commit91e66f9ba18f3d053859c58d6af97cdd4f79579b (patch)
treec7332eb61f5c2fee83957df6511ec41a45800a06
parentcd3d535d383b726c3653410b31faa0866ef79511 (diff)
parente88055bb15b9157234fc33aa46516da0b4591da7 (diff)
Merge "libbinder_ndk: fix UB memory access for race"
-rw-r--r--libs/binder/ndk/ibinder_internal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/ndk/ibinder_internal.h b/libs/binder/ndk/ibinder_internal.h
index 0dd795a676..202d6d2e6a 100644
--- a/libs/binder/ndk/ibinder_internal.h
+++ b/libs/binder/ndk/ibinder_internal.h
@@ -133,7 +133,7 @@ struct AIBinder_DeathRecipient {
// 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 @@ struct AIBinder_DeathRecipient {
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);