commit 009207d4404afd67f731cf1fc31d9dc3353db910
author Ivan Lozano <ivanlozano@google.com> Thu Dec 21 19:46:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 19:46:02 2017 +0000
tree 1f446c0ff976e8bcb9ace209c45763672c18433a
parent 20b975af6fb49020ba12a1bf3c4af70342b476fb
parent c8e7a9d37db5954a8456aef44087e5f0b8a6612c

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

Change-Id: Ia2fd1bf3245998cf9e6c14b2b45af0b8cc0adcb0

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;
   }