commit be25c5de0bc70c0d7b62c43fa4c2d58b329323a3
author Mark Salyzyn <salyzyn@google.com> Tue Dec 08 00:31:59 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 00:31:59 2015 +0000
tree 7e3958b5a70e3580dc8761093c98fc994af5304e
parent e90e26bdda2ed368d5ce5469d60a8aed11052d80
parent 7fb964f46e6f09930e232da5b4c2e269772ea8d9

Merge "liblog: print message payload of zero length"
am: 50413c7626

* commit '50413c7626c7598ccb062d7d1156e5cfa1b2cb8e':
  liblog: print message payload of zero length

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index ad52a81..40e13f4 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -500,14 +500,14 @@
     }
     if (msgEnd == -1) {
         /* incoming message not null-terminated; force it */
-        msgEnd = buf->len - 1;
+        msgEnd = buf->len - 1; /* may result in msgEnd < msgStart */
         msg[msgEnd] = '\0';
     }
 
     entry->priority = msg[0];
     entry->tag = msg + 1;
     entry->message = msg + msgStart;
-    entry->messageLen = msgEnd - msgStart;
+    entry->messageLen = (msgEnd < msgStart) ? 0 : (msgEnd - msgStart);
 
     return 0;
 }