Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add length-equality test in String operator== checks."

Browse Source
This commit is contained in:
Brad Fitzpatrick
2010-10-20 15:47:04 -07:00
committed by Android (Google) Code Review
parent fb26350c00 e28210d401
commit fb3132e866
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/utils/String16.h
View File

@@ -205,7 +205,9 @@ inline bool String16::operator<=(const String16& other) const
inline bool String16::operator==(const String16& other) const
{
return strzcmp16(mString, size(), other.mString, other.size()) == 0;
const size_t n1 = size();
const size_t n2 = other.size();
return n1 == n2 && strzcmp16(mString, n1, other.mString, n2) == 0;
}
inline bool String16::operator!=(const String16& other) const

4
include/utils/String8.h
View File

@@ -418,7 +418,9 @@ inline bool String8::operator<=(const String8& other) const
inline bool String8::operator==(const String8& other) const
{
return strcmp(mString, other.mString) == 0;
return (SharedBuffer::sizeFromData(mString) ==
SharedBuffer::sizeFromData(other.mString)) &&
strcmp(mString, other.mString) == 0;
}
inline bool String8::operator!=(const String8& other) const