commit 438b5b3a76ee33a71ba53d1d47c602c85919719c
author Mark Salyzyn <salyzyn@google.com> Tue Dec 08 04:53:54 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 04:53:54 2015 +0000
tree befc832c505aca0d899d7b43143080d5f909fafd
parent f2e06d0da376dbdb81b6cb7eacbc0abf7f896038
parent a8981864c59c35a2007630647509bda7a3fc2847

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

* commit '1f6a9473a73371c2e7d8e28e1692c64e5a2efd0a':
  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;
 }