azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix range checks for strings for optimized builds. (#2607)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-02-01 09:05:56 +03:00
committed by GitHub
parent da652713e6
commit a35a06f9f8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/runtime/text/utf8.kt
+2 -2
View File
@@ -172,7 +172,7 @@ fun test16to8CustomBorders() {
checkUtf16to8Replacing("Hello!", intArrayOf('e'.toInt(), 'l'.toInt()), 1, 2) checkUtf16to8Replacing("Hello!", intArrayOf('e'.toInt(), 'l'.toInt()), 1, 2)
checkUtf16to8Replacing("Hello!", intArrayOf('o'.toInt(), '!'.toInt()), 4, 2) checkUtf16to8Replacing("Hello!", intArrayOf('o'.toInt(), '!'.toInt()), 4, 2)
checkUtf16to8Replacing("Hello!", intArrayOf(), 0, 0) checkUtf16to8Replacing("Hello!", intArrayOf(), 0, 0)
checkUtf16to8Replacing("Hello!", intArrayOf(), 10, 0) checkUtf16to8Replacing("Hello!", intArrayOf(), 6, 0)
checkUtf16to8Replacing("\uD800\uDC00\uD800\uDC00\uD800\uDC00\uD800\uDC00", checkUtf16to8Replacing("\uD800\uDC00\uD800\uDC00\uD800\uDC00\uD800\uDC00",
intArrayOf(-16, -112, -128, -128, -16, -112, -128, -128), 0, 4) intArrayOf(-16, -112, -128, -128, -16, -112, -128, -128), 0, 4)
@@ -206,7 +206,7 @@ fun test16to8CustomBorders() {
checkUtf16to8Throwing("Hello!", intArrayOf('e'.toInt(), 'l'.toInt()), 1, 2) checkUtf16to8Throwing("Hello!", intArrayOf('e'.toInt(), 'l'.toInt()), 1, 2)
checkUtf16to8Throwing("Hello!", intArrayOf('o'.toInt(), '!'.toInt()), 4, 2) checkUtf16to8Throwing("Hello!", intArrayOf('o'.toInt(), '!'.toInt()), 4, 2)
checkUtf16to8Throwing("Hello!", intArrayOf(), 0, 0) checkUtf16to8Throwing("Hello!", intArrayOf(), 0, 0)
checkUtf16to8Throwing("Hello!", intArrayOf(), 10, 0) checkUtf16to8Throwing("Hello!", intArrayOf(), 6, 0)
checkUtf16to8Throwing("\uD800\uDC00\uD800\uDC00\uD800\uDC00\uD800\uDC00", checkUtf16to8Throwing("\uD800\uDC00\uD800\uDC00\uD800\uDC00\uD800\uDC00",
intArrayOf(-16, -112, -128, -128, -16, -112, -128, -128), 0, 4) intArrayOf(-16, -112, -128, -128, -16, -112, -128, -128), 0, 4)
runtime/src/main/cpp/KString.cpp
+4 -4
View File
@@ -50,7 +50,7 @@ OBJ_GETTER(utf8ToUtf16Impl, const char* rawString, const char* end, uint32_t cha
template<utf16to8 conversion> template<utf16to8 conversion>
OBJ_GETTER(utf16ToUtf8Impl, KString thiz, KInt start, KInt size) { OBJ_GETTER(utf16ToUtf8Impl, KString thiz, KInt start, KInt size) {
RuntimeAssert(thiz->type_info() == theStringTypeInfo, "Must use String"); RuntimeAssert(thiz->type_info() == theStringTypeInfo, "Must use String");
if (start < 0 || size < 0 || size > thiz->count_ - start) { if (start < 0 || size < 0 || (size > static_cast<KInt>(thiz->count_) - start)) {
ThrowArrayIndexOutOfBoundsException(); ThrowArrayIndexOutOfBoundsException();
} }
const KChar* utf16 = CharArrayAddressOfElementAt(thiz, start); const KChar* utf16 = CharArrayAddressOfElementAt(thiz, start);
@@ -963,8 +963,8 @@ KBoolean Kotlin_String_regionMatches(KString thiz, KInt thizOffset,
KString other, KInt otherOffset, KString other, KInt otherOffset,
KInt length, KBoolean ignoreCase) { KInt length, KBoolean ignoreCase) {
if (length < 0 || if (length < 0 ||
thizOffset < 0 || length > thiz->count_ - thizOffset || thizOffset < 0 || length > static_cast<KInt>(thiz->count_) - thizOffset ||
otherOffset < 0 || length > other->count_ - otherOffset) { otherOffset < 0 || length > static_cast<KInt>(other->count_) - otherOffset) {
return false; return false;
} }
const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, thizOffset); const KChar* thizRaw = CharArrayAddressOfElementAt(thiz, thizOffset);
@@ -1111,7 +1111,7 @@ KInt Kotlin_String_indexOfString(KString thiz, KString other, KInt fromIndex) {
if (fromIndex >= thiz->count_) { if (fromIndex >= thiz->count_) {
return (other->count_ == 0) ? thiz->count_ : -1; return (other->count_ == 0) ? thiz->count_ : -1;
} }
if (other->count_ > thiz->count_ - fromIndex) { if (other->count_ > static_cast<KInt>(thiz->count_) - fromIndex) {
return -1; return -1;
} }
// An empty string can be always found. // An empty string can be always found.