diff options
| -rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 8 | ||||
| -rw-r--r-- | tools/aapt2/util/Util.cpp | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index bb09d001037d..7213414af19f 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -280,7 +280,7 @@ static void fillCharArrayBufferUTF(JNIEnv* env, jobject bufferObj, if (size) { jchar* data = static_cast<jchar*>(env->GetPrimitiveArrayCritical(dataObj, NULL)); utf8_to_utf16_no_null_terminator(reinterpret_cast<const uint8_t*>(str), len, - reinterpret_cast<char16_t*>(data)); + reinterpret_cast<char16_t*>(data), (size_t) size); env->ReleasePrimitiveArrayCritical(dataObj, data, 0); } env->SetIntField(bufferObj, gCharArrayBufferClassInfo.sizeCopied, size); diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index bf2648accfaa..b423f6c5afa5 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -776,7 +776,7 @@ const char16_t* ResStringPool::stringAt(size_t idx, size_t* u16len) const if (kDebugStringPoolNoisy) { ALOGI("Caching UTF8 string: %s", u8str); } - utf8_to_utf16(u8str, u8len, u16str); + utf8_to_utf16(u8str, u8len, u16str, *u16len + 1); mCache[idx] = u16str; return u16str; } else { @@ -883,7 +883,8 @@ ssize_t ResStringPool::indexOfString(const char16_t* str, size_t strLen) const // the ordering, we need to convert strings in the pool to UTF-16. // But we don't want to hit the cache, so instead we will have a // local temporary allocation for the conversions. - char16_t* convBuffer = (char16_t*)malloc(strLen+4); + size_t convBufferLen = strLen + 4; + char16_t* convBuffer = (char16_t*)calloc(convBufferLen, sizeof(char16_t)); ssize_t l = 0; ssize_t h = mHeader->stringCount-1; @@ -893,8 +894,7 @@ ssize_t ResStringPool::indexOfString(const char16_t* str, size_t strLen) const const uint8_t* s = (const uint8_t*)string8At(mid, &len); int c; if (s != NULL) { - char16_t* end = utf8_to_utf16_n(s, len, convBuffer, strLen+3); - *end = 0; + char16_t* end = utf8_to_utf16(s, len, convBuffer, convBufferLen); c = strzcmp16(convBuffer, end-convBuffer, str, strLen); } else { c = -1; diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp index 3c0e9bdeab0d..e743247be8a9 100644 --- a/tools/aapt2/util/Util.cpp +++ b/tools/aapt2/util/Util.cpp @@ -434,7 +434,11 @@ std::u16string utf8ToUtf16(const StringPiece& utf8) { std::u16string utf16; utf16.resize(utf16Length); - utf8_to_utf16(reinterpret_cast<const uint8_t*>(utf8.data()), utf8.length(), &*utf16.begin()); + utf8_to_utf16( + reinterpret_cast<const uint8_t*>(utf8.data()), + utf8.length(), + &*utf16.begin(), + (size_t) utf16Length + 1); return utf16; } |