diff options
| -rw-r--r-- | logd/LogBuffer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index 9c634f680..2b6c27688 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -180,8 +180,13 @@ static enum match_type identical(LogBufferElement* elem, if (!avcr) return DIFFERENT; lenr -= avcr - msgr; if (lenl != lenr) return DIFFERENT; - if (fastcmp<memcmp>(avcl + strlen(avc), avcr + strlen(avc), lenl)) + // 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; } |