commit 994754fa2a3667962bedfd379ff13add9a32d574
author Mark Salyzyn <salyzyn@google.com> Wed Mar 15 19:14:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 19:14:11 2017 +0000
tree 23aa44fcfbc540d84f2d944900944cd57c0fdafc
parent 819f34a7f358cae920a03de6913c204577305a6e
parent e8b5dca8c21177ef87bc00f7bda10a0ea8c1e5ef

Merge "logcat: test: tail_# occasional failures" am: e7b335b471 am: a1f43ebf89
am: e8b5dca8c2

Change-Id: I0a47af262457d7de1d35d1e2dabfaf80fb70e4be

logcat/tests/logcat_test.cpp

diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index dad74ee..0895834 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -208,9 +208,9 @@
         if ((*ep != '-') && (*ep != '.')) {
             continue;
         }
-        // Find PID field
+        // Find PID field.  Look for ': ' or ':[0-9][0-9][0-9]'
         while (((ep = strchr(ep, ':'))) && (*++ep != ' ')) {
-            ;
+            if (isdigit(ep[0]) && isdigit(ep[1]) && isdigit(ep[2])) break;
         }
         if (!ep) {
             continue;