commit 00d73aa4bce831f9af661f034af9d472aa5c500d
author Greg Kaiser <gkaiser@google.com> Mon Aug 08 18:20:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 08 18:20:12 2016 +0000
tree 8a0c16e3af55eccacf0a45ba45368c6f101093df
parent bc808b190a26e27b538b51891cc504a89511e3ed
parent f40aee1434fa7bd85e4909ddce6930207b20615e

Merge "SharedBuffer: Fix bug in return value of release()" am: c064db48f1 am: f068856284
am: 29e672f9cb

Change-Id: I8939fafb694ccc96fcca0a6de51d327ef23255c1

libutils/SharedBuffer.cpp

diff --git a/libutils/SharedBuffer.cpp b/libutils/SharedBuffer.cpp
index a8a9fb4..6c8c7d3 100644
--- a/libutils/SharedBuffer.cpp
+++ b/libutils/SharedBuffer.cpp
@@ -112,8 +112,9 @@
 int32_t SharedBuffer::release(uint32_t flags) const
 {
     int32_t prev = 1;
-    if (onlyOwner() || ((prev = mRefs.fetch_sub(1, std::memory_order_release) == 1)
-            && (atomic_thread_fence(std::memory_order_acquire), true))) {
+    if (onlyOwner()
+            || (((prev = mRefs.fetch_sub(1, std::memory_order_release)) == 1)
+                && (atomic_thread_fence(std::memory_order_acquire), true))) {
         mRefs.store(0, std::memory_order_relaxed);
         if ((flags & eKeepStorage) == 0) {
             free(const_cast<SharedBuffer*>(this));