diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-21 19:25:46 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-21 19:25:46 +0000 |
commit | baeefd243f480bbbc22e36a3ae981b4cfd91efe8 (patch) | |
tree | 11d5e9d6bbaef903597d9399008459a678b834c7 | |
parent | cb1a2b98f2dfef30e2e987698321d84cf49d7b17 (diff) | |
parent | 9871efb4e59ecf8ac778d22d7b834abea619e2bd (diff) | |
download | core-oreo-m2-s4-release.tar.gz |
Merge cherrypicks of [3775466, 3774310, 3774548, 3774358, 3774359, 3774360, 3774361, 3774362, 3774363, 3775784, 3775785, 3775786, 3775787, 3775788, 3775789, 3774751, 3774549, 3774202, 3774203, 3774752] into oc-m2-releaseandroid-8.1.0_r36android-8.1.0_r35android-8.1.0_r30oreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-release
Change-Id: I49d40ffa0ea700ebb230dab1ea35780a2485dc35
-rw-r--r-- | libutils/String16.cpp | 62 |
1 files changed, 34 insertions, 28 deletions
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index ad335c399..e8f1c5184 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp @@ -79,6 +79,23 @@ static char16_t* allocFromUTF8(const char* u8str, size_t u8len) return getEmptyString(); } +static char16_t* allocFromUTF16(const char16_t* u16str, size_t u16len) { + if (u16len >= SIZE_MAX / sizeof(char16_t)) { + android_errorWriteLog(0x534e4554, "73826242"); + abort(); + } + + SharedBuffer* buf = SharedBuffer::alloc((u16len + 1) * sizeof(char16_t)); + ALOG_ASSERT(buf, "Unable to allocate shared buffer"); + if (buf) { + char16_t* str = (char16_t*)buf->data(); + memcpy(str, u16str, u16len * sizeof(char16_t)); + str[u16len] = 0; + return str; + } + return getEmptyString(); +} + // --------------------------------------------------------------------------- String16::String16() @@ -111,35 +128,9 @@ String16::String16(const String16& o, size_t len, size_t begin) setTo(o, len, begin); } -String16::String16(const char16_t* o) -{ - size_t len = strlen16(o); - SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t)); - ALOG_ASSERT(buf, "Unable to allocate shared buffer"); - if (buf) { - char16_t* str = (char16_t*)buf->data(); - strcpy16(str, o); - mString = str; - return; - } - - mString = getEmptyString(); -} - -String16::String16(const char16_t* o, size_t len) -{ - SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t)); - ALOG_ASSERT(buf, "Unable to allocate shared buffer"); - if (buf) { - char16_t* str = (char16_t*)buf->data(); - memcpy(str, o, len*sizeof(char16_t)); - str[len] = 0; - mString = str; - return; - } +String16::String16(const char16_t* o) : mString(allocFromUTF16(o, strlen16(o))) {} - mString = getEmptyString(); -} +String16::String16(const char16_t* o, size_t len) : mString(allocFromUTF16(o, len)) {} String16::String16(const String8& o) : mString(allocFromUTF8(o.string(), o.size())) @@ -201,6 +192,11 @@ status_t String16::setTo(const char16_t* other) status_t String16::setTo(const char16_t* other, size_t len) { + if (len >= SIZE_MAX / sizeof(char16_t)) { + android_errorWriteLog(0x534e4554, "73826242"); + abort(); + } + SharedBuffer* buf = SharedBuffer::bufferFromData(mString) ->editResize((len+1)*sizeof(char16_t)); if (buf) { @@ -224,6 +220,11 @@ status_t String16::append(const String16& other) return NO_ERROR; } + if (myLen >= SIZE_MAX / sizeof(char16_t) - otherLen) { + android_errorWriteLog(0x534e4554, "73826242"); + abort(); + } + SharedBuffer* buf = SharedBuffer::bufferFromData(mString) ->editResize((myLen+otherLen+1)*sizeof(char16_t)); if (buf) { @@ -245,6 +246,11 @@ status_t String16::append(const char16_t* chrs, size_t otherLen) return NO_ERROR; } + if (myLen >= SIZE_MAX / sizeof(char16_t) - otherLen) { + android_errorWriteLog(0x534e4554, "73826242"); + abort(); + } + SharedBuffer* buf = SharedBuffer::bufferFromData(mString) ->editResize((myLen+otherLen+1)*sizeof(char16_t)); if (buf) { |