commit a44e24ea53e61be704387ed8b567818a184e6f25
author Ivan Lozano <ivanlozano@google.com> Wed Dec 06 23:03:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 06 23:03:00 2017 +0000
tree 253b5b65efbd5f20aa17533ba390017b52f34b43
parent 99da22681968f6b84ff804bc3b46fd46331c2229
parent 5ec161bb6845402ceed033c0f9d91127127b27e6

Merge "Fix audioflinger in overflow sanitized builds."

services/audioflinger/Tracks.cpp

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 1445572..cdd8ca0 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -1102,11 +1102,12 @@
 
 void AudioFlinger::PlaybackThread::Track::triggerEvents(AudioSystem::sync_event_t type)
 {
-    for (size_t i = 0; i < mSyncEvents.size(); i++) {
+    for (size_t i = 0; i < mSyncEvents.size();) {
         if (mSyncEvents[i]->type() == type) {
             mSyncEvents[i]->trigger();
             mSyncEvents.removeAt(i);
-            i--;
+        } else {
+            ++i;
         }
     }
 }