|
 |
70eee0 |
diff -ru icu/source/common/unistr.cpp icu.new/source/common/unistr.cpp
|
|
|
70eee0 |
--- icu/source/common/unistr.cpp 2019-04-12 00:26:16.000000000 +0200
|
|
|
70eee0 |
+++ icu.new/source/common/unistr.cpp 2020-03-03 15:39:37.069874709 +0100
|
|
|
70eee0 |
@@ -1544,7 +1544,11 @@
|
|
|
70eee0 |
}
|
|
|
70eee0 |
|
|
|
70eee0 |
int32_t oldLength = length();
|
|
|
70eee0 |
- int32_t newLength = oldLength + srcLength;
|
|
|
70eee0 |
+ int32_t newLength;
|
|
|
70eee0 |
+ if (uprv_add32_overflow(oldLength, srcLength, &newLength)) {
|
|
|
70eee0 |
+ setToBogus();
|
|
|
70eee0 |
+ return *this;
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
// optimize append() onto a large-enough, owned string
|
|
|
70eee0 |
if((newLength <= getCapacity() && isBufferWritable()) ||
|
|
|
70eee0 |
cloneArrayIfNeeded(newLength, getGrowCapacity(newLength))) {
|
|
|
70eee0 |
diff -ru icu/source/test/intltest/ustrtest.cpp icu.new/source/test/intltest/ustrtest.cpp
|
|
|
70eee0 |
--- icu/source/test/intltest/ustrtest.cpp 2019-04-12 00:26:16.000000000 +0200
|
|
|
70eee0 |
+++ icu.new/source/test/intltest/ustrtest.cpp 2020-03-03 15:44:59.059239188 +0100
|
|
|
70eee0 |
@@ -64,6 +64,7 @@
|
|
|
70eee0 |
TESTCASE_AUTO(TestUInt16Pointers);
|
|
|
70eee0 |
TESTCASE_AUTO(TestWCharPointers);
|
|
|
70eee0 |
TESTCASE_AUTO(TestNullPointers);
|
|
|
70eee0 |
+ TESTCASE_AUTO(TestLargeAppend);
|
|
|
70eee0 |
TESTCASE_AUTO_END;
|
|
|
70eee0 |
}
|
|
|
70eee0 |
|
|
|
70eee0 |
@@ -2248,3 +2249,64 @@
|
|
|
70eee0 |
UnicodeString(u"def").extract(nullptr, 0, errorCode);
|
|
|
70eee0 |
assertEquals("buffer overflow extracting to nullptr", U_BUFFER_OVERFLOW_ERROR, errorCode);
|
|
|
70eee0 |
}
|
|
|
70eee0 |
+
|
|
|
70eee0 |
+void UnicodeStringTest::TestLargeAppend() {
|
|
|
70eee0 |
+ if(quick) return;
|
|
|
70eee0 |
+
|
|
|
70eee0 |
+ IcuTestErrorCode status(*this, "TestLargeAppend");
|
|
|
70eee0 |
+ // Make a large UnicodeString
|
|
|
70eee0 |
+ int32_t len = 0xAFFFFFF;
|
|
|
70eee0 |
+ UnicodeString str;
|
|
|
70eee0 |
+ char16_t *buf = str.getBuffer(len);
|
|
|
70eee0 |
+ // A fast way to set buffer to valid Unicode.
|
|
|
70eee0 |
+ // 4E4E is a valid unicode character
|
|
|
70eee0 |
+ uprv_memset(buf, 0x4e, len * 2);
|
|
|
70eee0 |
+ str.releaseBuffer(len);
|
|
|
70eee0 |
+ UnicodeString dest;
|
|
|
70eee0 |
+ // Append it 16 times
|
|
|
70eee0 |
+ // 0xAFFFFFF times 16 is 0xA4FFFFF1,
|
|
|
70eee0 |
+ // which is greater than INT32_MAX, which is 0x7FFFFFFF.
|
|
|
70eee0 |
+ int64_t total = 0;
|
|
|
70eee0 |
+ for (int32_t i = 0; i < 16; i++) {
|
|
|
70eee0 |
+ dest.append(str);
|
|
|
70eee0 |
+ total += len;
|
|
|
70eee0 |
+ if (total <= INT32_MAX) {
|
|
|
70eee0 |
+ assertFalse("dest is not bogus", dest.isBogus());
|
|
|
70eee0 |
+ } else {
|
|
|
70eee0 |
+ assertTrue("dest should be bogus", dest.isBogus());
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
+ dest.remove();
|
|
|
70eee0 |
+ total = 0;
|
|
|
70eee0 |
+ for (int32_t i = 0; i < 16; i++) {
|
|
|
70eee0 |
+ dest.append(str);
|
|
|
70eee0 |
+ total += len;
|
|
|
70eee0 |
+ if (total + len <= INT32_MAX) {
|
|
|
70eee0 |
+ assertFalse("dest is not bogus", dest.isBogus());
|
|
|
70eee0 |
+ } else if (total <= INT32_MAX) {
|
|
|
70eee0 |
+ // Check that a string of exactly the maximum size works
|
|
|
70eee0 |
+ UnicodeString str2;
|
|
|
70eee0 |
+ int32_t remain = INT32_MAX - total;
|
|
|
70eee0 |
+ char16_t *buf2 = str2.getBuffer(remain);
|
|
|
70eee0 |
+ if (buf2 == nullptr) {
|
|
|
70eee0 |
+ // if somehow memory allocation fail, return the test
|
|
|
70eee0 |
+ return;
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
+ uprv_memset(buf2, 0x4e, remain * 2);
|
|
|
70eee0 |
+ str2.releaseBuffer(remain);
|
|
|
70eee0 |
+ dest.append(str2);
|
|
|
70eee0 |
+ total += remain;
|
|
|
70eee0 |
+ assertEquals("When a string of exactly the maximum size works", (int64_t)INT32_MAX, total);
|
|
|
70eee0 |
+ assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length());
|
|
|
70eee0 |
+ assertFalse("dest is not bogus", dest.isBogus());
|
|
|
70eee0 |
+
|
|
|
70eee0 |
+ // Check that a string size+1 goes bogus
|
|
|
70eee0 |
+ str2.truncate(1);
|
|
|
70eee0 |
+ dest.append(str2);
|
|
|
70eee0 |
+ total++;
|
|
|
70eee0 |
+ assertTrue("dest should be bogus", dest.isBogus());
|
|
|
70eee0 |
+ } else {
|
|
|
70eee0 |
+ assertTrue("dest should be bogus", dest.isBogus());
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
+ }
|
|
|
70eee0 |
+}
|
|
|
70eee0 |
diff -ru icu/source/test/intltest/ustrtest.h icu.new/source/test/intltest/ustrtest.h
|
|
|
70eee0 |
--- icu/source/test/intltest/ustrtest.h 2019-04-12 00:26:16.000000000 +0200
|
|
|
70eee0 |
+++ icu.new/source/test/intltest/ustrtest.h 2020-03-03 15:45:36.147935611 +0100
|
|
|
70eee0 |
@@ -96,6 +96,7 @@
|
|
|
70eee0 |
void TestUInt16Pointers();
|
|
|
70eee0 |
void TestWCharPointers();
|
|
|
70eee0 |
void TestNullPointers();
|
|
|
70eee0 |
+ void TestLargeAppend();
|
|
|
70eee0 |
};
|
|
|
70eee0 |
|
|
|
70eee0 |
#endif
|