commit 99da22681968f6b84ff804bc3b46fd46331c2229
author Ivan Lozano <ivanlozano@google.com> Wed Dec 06 22:54:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 06 22:54:28 2017 +0000
tree 6a897bb1c345445e0757f5e0a834ba4ea218d185
parent 22e91601a37e01509e3a9229e3db3242d79fe38b
parent e71027ef59e4e48140b6fc1b5fd7a7037d2dee67

Merge "Fix integer sanitizer in FastMixerDumpState."

services/audioflinger/FastMixerDumpState.cpp

diff --git a/services/audioflinger/FastMixerDumpState.cpp b/services/audioflinger/FastMixerDumpState.cpp
index 6475f22..2e4fb8c 100644
--- a/services/audioflinger/FastMixerDumpState.cpp
+++ b/services/audioflinger/FastMixerDumpState.cpp
@@ -78,7 +78,12 @@
     uint32_t bounds = mBounds;
     uint32_t newestOpen = bounds & 0xFFFF;
     uint32_t oldestClosed = bounds >> 16;
-    uint32_t n = (newestOpen - oldestClosed) & 0xFFFF;
+
+    //uint32_t n = (newestOpen - oldestClosed) & 0xFFFF;
+    uint32_t n;
+    __builtin_sub_overflow(newestOpen, oldestClosed, &n);
+    n = n & 0xFFFF;
+
     if (n > mSamplingN) {
         ALOGE("too many samples %u", n);
         n = mSamplingN;