ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
TreeHugger Robot 2017-03-08 20:24:57 +00:00 • committed by Android (Google) Code Review
commit affc6cd0ed
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
logd/LogBuffer.cpp
View file

@ -182,7 +182,10 @@ static enum match_type identical(LogBufferElement* elem, LogBufferElement* last)
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;