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

Commit 8428e036 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix String8 to free its memory only after assignment operations based... 

Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken
parents 5517af44 a637eb48

libs/utils/String8.cpp

+8 −4
Original line number Diff line number Diff line
@@ -301,8 +301,9 @@ void String8::setTo(const String8& other) 


status_t String8::setTo(const char* other)

{

    const char *newString = allocFromUTF8(other, strlen(other));

    SharedBuffer::bufferFromData(mString)->release();

    mString = allocFromUTF8(other, strlen(other));

    mString = newString;

    if (mString) return NO_ERROR;



    mString = getEmptyString();
@@ -311,8 +312,9 @@ status_t String8::setTo(const char* other) 


status_t String8::setTo(const char* other, size_t len)

{

    const char *newString = allocFromUTF8(other, len);

    SharedBuffer::bufferFromData(mString)->release();

    mString = allocFromUTF8(other, len);

    mString = newString;

    if (mString) return NO_ERROR;



    mString = getEmptyString();
@@ -321,8 +323,9 @@ status_t String8::setTo(const char* other, size_t len) 


status_t String8::setTo(const char16_t* other, size_t len)

{

    const char *newString = allocFromUTF16(other, len);

    SharedBuffer::bufferFromData(mString)->release();

    mString = allocFromUTF16(other, len);

    mString = newString;

    if (mString) return NO_ERROR;



    mString = getEmptyString();
@@ -331,8 +334,9 @@ status_t String8::setTo(const char16_t* other, size_t len) 


status_t String8::setTo(const char32_t* other, size_t len)

{

    const char *newString = allocFromUTF32(other, len);

    SharedBuffer::bufferFromData(mString)->release();

    mString = allocFromUTF32(other, len);

    mString = newString;

    if (mString) return NO_ERROR;



    mString = getEmptyString();