commit 2a736093f78463d83b63cd10393a979acd68bcb1
author Nick Kralevich <nnk@google.com> Mon Oct 17 11:04:08 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 17 11:04:08 2011 -0700
tree 226e633d5a068624d91a23d8fefa3ac03125e7b2
parent f26c6567d6270d55f0bfc79bb7c497cfd669cf91
parent 63f4a84104c228c74cdf132f5cef4f5184ae04bb

am 63f4a841: liblog: ensure that the message length is consistent

* commit '63f4a84104c228c74cdf132f5cef4f5184ae04bb':
  liblog: ensure that the message length is consistent

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index 59fed9b..f2dd79f 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -374,6 +374,13 @@
     entry->messageLen = buf->len - preambleAndNullLen;
     entry->message = entry->tag + tag_len + 1;
 
+    if (entry->messageLen != strlen(entry->message)) {
+        fprintf(stderr,
+                "+++ LOG: Message length inconsistent. Expected %d, got %d\n",
+                entry->messageLen, strlen(entry->message));
+        return -1;
+    }
+
     return 0;
 }
 
@@ -830,7 +837,6 @@
         while(pm < (entry->message + entry->messageLen)) {
             const char *lineStart;
             size_t lineLen;
-
             lineStart = pm;
 
             // Find the next end-of-line in message