commit 3af839b11a6d6cd6b08467433557133ae9feafae
author Greg Hartman <ghartman@google.com> Wed Feb 15 21:43:30 2017 -0800
committer Greg Hartman <ghartman@google.com> Thu Feb 16 18:30:45 2017 +0000
tree 874396af880dbf01f756e8a955be97ea672794fa
parent a58bbb605485b1fee9a3307716e8619141e6b00d

Fix read past end of malloc block in logd

Bug: 35412453
Test: Local build
Change-Id: I0f9dee84ef689b042926b6b48abf0caeaa784add

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 7613c1e..e03731b 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -183,7 +183,8 @@
     lenr -= avcr - msgr;
     if (lenl != lenr) return DIFFERENT;
     if (fastcmp<memcmp>(avcl + strlen(avc),
-                        avcr + strlen(avc), lenl)) return DIFFERENT;
+                        avcr + strlen(avc),
+                        lenl - strlen(avc))) return DIFFERENT;
     return SAME;
 }