commit affc6cd0ed1de9493dda6a92fd3f31e595d954c9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 08 20:24:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 08 20:24:58 2017 +0000
tree aca3680442540b21cccd23d7a6d893d79b2eef4b
parent f837af98071be37254468aa72612809720457c6b
parent 589f4e7a66629e4d7dab6e679af81ae633932686

Merge "Fix heap-buffer-overflow detected by ASAN."

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index e03731b..0df6de0 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -182,7 +182,10 @@
     if (!avcr) return DIFFERENT;
     lenr -= avcr - msgr;
     if (lenl != lenr) return DIFFERENT;
-    if (fastcmp<memcmp>(avcl + strlen(avc),
+    // TODO: After b/35468874 is addressed, revisit "lenl > strlen(avc)"
+    // condition, it might become superflous.
+    if (lenl > strlen(avc) &&
+        fastcmp<memcmp>(avcl + strlen(avc),
                         avcr + strlen(avc),
                         lenl - strlen(avc))) return DIFFERENT;
     return SAME;