commit dfecd1c0ce7eadd2624840c4bec5fbe30dc8a7a7
author Mark Salyzyn <salyzyn@google.com> Sat Jun 13 02:37:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 02:37:26 2015 +0000
tree 6c39b4aef75a0692333e76530e64d631f6ca02af
parent e4cb839516734de587a55f1b1d3c9cfe39338fa4
parent ddbfb4dec23c8c7d43408c1aa80859f087c6f921

am ff41f149: am 363963d6: am de42d34c: Merge "logd: regression in log_strtok_r"

* commit 'ff41f149cc75d7719da1d8e688380ddeefa6f5a3':
  logd: regression in log_strtok_r

logd/LogKlog.cpp

diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index 7d14648..4e0e896 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -68,6 +68,9 @@
             continue;
         }
         if (!isdigit(c) && (c == ']')) {
+            if (first_period || (*s != ' ')) {
+                break;
+            }
             return s;
         }
     }
@@ -75,7 +78,7 @@
 }
 
 // Like strtok_r with "\r\n" except that we look for log signatures (regex)
-//   \(\(<[0-9]+>\)\([[] *[0-9]+[]]\)\{0,1\}\|[[] *[0-9]+[]]\)
+// \(\(<[0-9]+>\)\([[] *[0-9]+[.][0-9]+[]] \)\{0,1\}\|[[] *[0-9]+[.][0-9]+[]] \)
 // and split if we see a second one without a newline.
 
 #define SIGNATURE_MASK     0xF0