commit 96f12993947f6bf0240ab28e7f44379a0acafbfd
author Ivan Lozano <ivanlozano@google.com> Thu Nov 09 14:45:38 2017 -0800
committer Ivan Lozano <ivanlozano@google.com> Mon Nov 13 08:34:33 2017 -0800
tree b7c4d76b87631e605e583c735a8ee6768bbd92f2
parent 0c911c0c5aa495ff01bf2d9e20834a92d6179c4e

Fix sanitizer in InputFlinger Reader/Dispatcher.

Refactor for loops that were generating runtime errors on integer
sanitized builds.

Bug: 30969751
Test: Compiles and boots without runtime errors.

Change-Id: I5772333b8060d643c756f229187d02ae5caa7ed7

services/inputflinger/InputReader.cpp

diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 4304982..591f8d7 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -1174,7 +1174,7 @@
     // gamepad button presses are handled by different mappers but they should be dispatched
     // in the order received.
     size_t numMappers = mMappers.size();
-    for (const RawEvent* rawEvent = rawEvents; count--; rawEvent++) {
+    for (const RawEvent* rawEvent = rawEvents; count != 0; rawEvent++) {
 #if DEBUG_RAW_EVENTS
         ALOGD("Input event: device=%d type=0x%04x code=0x%04x value=0x%08x when=%" PRId64,
                 rawEvent->deviceId, rawEvent->type, rawEvent->code, rawEvent->value,
@@ -1202,6 +1202,7 @@
                 mapper->process(rawEvent);
             }
         }
+        --count;
     }
 }