commit e4f668d3709560a15288c52053029ec424548dfe
author Mark Salyzyn <salyzyn@google.com> Tue Mar 13 22:04:35 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 13 22:04:35 2018 +0000
tree bf0d730e9c633ec781e148f38244361ac14dec89
parent 00716646ad8a97e68e2c250d21a064ece6d26d08
parent b059a1497c048bf1a89a4235fe4c4ff77c1d041a

Merge "logd: identical check access message data out of range"
am: 887d74b479

Change-Id: I81a8f1ae6ea5560d30c92c73cce9825505a56cbd

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index b8af2f0..a78319f 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -171,7 +171,9 @@
     }
 
     // audit message (except sequence number) identical?
-    if (last->isBinary()) {
+    if (last->isBinary() &&
+        (lenl > static_cast<ssize_t>(sizeof(android_log_event_string_t))) &&
+        (lenr > static_cast<ssize_t>(sizeof(android_log_event_string_t)))) {
         if (fastcmp<memcmp>(msgl, msgr, sizeof(android_log_event_string_t) -
                                             sizeof(int32_t))) {
             return DIFFERENT;