commit 3367b1e708c7748ff436a868bf3785077cb1e66e
author Steven Moreland <smoreland@google.com> Tue Nov 27 02:33:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 27 02:33:07 2018 +0000
tree d211e44a5136d7c10553e529d2d6c4709f981784
parent ebad92540553de4f991064548724725bb7e3b87c
parent 8437d9f623150ee61a5af8d4871e1e1fde98e89e

Merge "Fix double-freeing of ScopedAResource"

libs/binder/ndk/include_ndk/android/binder_auto_utils.h

diff --git a/libs/binder/ndk/include_ndk/android/binder_auto_utils.h b/libs/binder/ndk/include_ndk/android/binder_auto_utils.h
index e2c0cfa..c6fcaa4 100644
--- a/libs/binder/ndk/include_ndk/android/binder_auto_utils.h
+++ b/libs/binder/ndk/include_ndk/android/binder_auto_utils.h
@@ -163,7 +163,9 @@
     ScopedAResource& operator=(ScopedAResource&&) = delete;
 
     // move-constructing is okay
-    ScopedAResource(ScopedAResource&&) = default;
+    ScopedAResource(ScopedAResource&& other) : mT(std::move(other.mT)) {
+      other.mT = DEFAULT;
+    }
 
    private:
     T mT;