| commit | ffd904da91d367eafbde53865b87cc9713bf631d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Feb 16 19:32:07 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 16 19:32:07 2017 +0000 |
| tree | 03fbd29893d6e129ab29d2e37dbe7b4960cf05ac | |
| parent | ce91a06290dbba20ed690a6275741aad6aa8916a [diff] | |
| parent | 3af839b11a6d6cd6b08467433557133ae9feafae [diff] |
Merge "Fix read past end of malloc block in logd"
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; }