Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075e7503 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick
Browse files

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

Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
parent c86ff484

include/utils/String16.h

+3 −1
Original line number Diff line number Diff line
@@ -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

include/utils/String8.h

+3 −1
Original line number Diff line number Diff line
@@ -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