commit 1a4992c6ba49da8a8ea5a17705b04a653b234e1a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 15:49:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 15:49:21 2020 +0000
tree 96979a08bbd27430058eeda447e1261d7e56a77e
parent 09314d79d6b33e1a5c8a985660812d978acd38dc
parent af06badcdd0402f6cf305e7087ba6b7738d0c6fc

Merge "liblog: null terminate log_msg" am: 1153fbbcd3

Change-Id: I783c397431d8dea1959d979a0942f0095a0829e8

liblog/logger_read.cpp

diff --git a/liblog/logger_read.cpp b/liblog/logger_read.cpp
index a0c526b..4937042 100644
--- a/liblog/logger_read.cpp
+++ b/liblog/logger_read.cpp
@@ -109,8 +109,8 @@
     return ret;
   }
 
-  if (ret > (int)sizeof(*log_msg)) {
-    ret = sizeof(*log_msg);
+  if (ret > LOGGER_ENTRY_MAX_LEN) {
+    ret = LOGGER_ENTRY_MAX_LEN;
   }
 
   if (ret < static_cast<int>(sizeof(log_msg->entry))) {
@@ -118,7 +118,7 @@
   }
 
   if (log_msg->entry.hdr_size < sizeof(log_msg->entry) ||
-      log_msg->entry.hdr_size >= sizeof(struct log_msg) - sizeof(log_msg->entry)) {
+      log_msg->entry.hdr_size >= LOGGER_ENTRY_MAX_LEN - sizeof(log_msg->entry)) {
     return -EINVAL;
   }
 
@@ -126,6 +126,8 @@
     return -EINVAL;
   }
 
+  log_msg->buf[log_msg->entry.len + log_msg->entry.hdr_size] = '\0';
+
   return ret;
 }