commit c8e7a9d37db5954a8456aef44087e5f0b8a6612c
author Ivan Lozano <ivanlozano@google.com> Thu Dec 21 17:52:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 17:52:41 2017 +0000
tree 5bf5a117866e458f0c2c5eb7a17c9d7249a948f9
parent d31fcaa01de816008ba6cc5607e3d8041efd3f74
parent b953d81a753a121ec694c3145c6334faf18b0d1e

Merge "Fix sanitizer errors in bootstat.cpp."
am: 9ddf491492

Change-Id: Ib417abbcf4ce2b18f508af9e0ef95e4cca789c02

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index f81206a..a1fcad8 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -429,9 +429,11 @@
     if (needle.length() > pos) return std::string::npos;
     pos -= needle.length();
     // fuzzy match to maximum kBitErrorRate
-    do {
+    for (;;) {
       if (numError(pos, needle) != std::string::npos) return pos;
-    } while (pos-- != 0);
+      if (pos == 0) break;
+      --pos;
+    }
     return std::string::npos;
   }