commit 2bfa8f43d63c64b52b78ec4a721dad5b64e0ac66
author Ivan Lozano <ivanlozano@google.com> Wed Jan 17 20:51:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 17 20:51:50 2018 +0000
tree 18d23fcaae03ea30c89aad6c83fa4ab2629c6bc8
parent 1b97976a698b77b880fab967ad47696483c4c6c1
parent ceb30493c7ea9f2c6925e17cc0626396de8f8080

Merge "Fix integer overflow sanitizer in FastThread.cpp."

services/audioflinger/FastThread.cpp

diff --git a/services/audioflinger/FastThread.cpp b/services/audioflinger/FastThread.cpp
index 85865b7..dc15487 100644
--- a/services/audioflinger/FastThread.cpp
+++ b/services/audioflinger/FastThread.cpp
@@ -297,7 +297,8 @@
                     size_t i = mBounds & (mDumpState->mSamplingN - 1);
                     mBounds = (mBounds & 0xFFFF0000) | ((mBounds + 1) & 0xFFFF);
                     if (mFull) {
-                        mBounds += 0x10000;
+                        //mBounds += 0x10000;
+                        __builtin_add_overflow(mBounds, 0x10000, &mBounds);
                     } else if (!(mBounds & (mDumpState->mSamplingN - 1))) {
                         mFull = true;
                     }