organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-04 13:05:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

ICU-23060 Fix TestLargeAppend

Browse source 
Correct the test based on the kMaxCapacity
setToBogus on error
This commit is contained in:
Frank Tang 2025-02-26 18:53:57 -08:00 • committed by Frank Yung-Fong Tang
parent d6ca2ba5de
commit 53adb4bca8
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/unistr.cpp
View file

@ -1946,9 +1946,11 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity,
} else if(newCapacity <= US_STACKBUF_SIZE && growCapacity > US_STACKBUF_SIZE) {
growCapacity = US_STACKBUF_SIZE;
} else if(newCapacity > growCapacity) {
setToBogus();
return false; // bad inputs
}
if(growCapacity > kMaxCapacity) {
setToBogus();
return false;
}

19
icu4c/source/test/intltest/ustrtest.cpp
View file

@ -2392,15 +2392,17 @@ void UnicodeStringTest::TestLargeAppend() {
}
dest.remove();
total = 0;
// Copy kMaxCapacity from common/unistr.cpp
const int32_t kMaxCapacity = 0x7ffffff5;
for (int32_t i = 0; i < 16; i++) {
dest.append(str);
total += len;
if (total + len <= INT32_MAX) {
if (total + len <= kMaxCapacity) {
assertFalse("dest is not bogus", dest.isBogus());
} else if (total <= INT32_MAX) {
} else if (total <= kMaxCapacity) {
// Check that a string of exactly the maximum size works
UnicodeString str2;
int32_t remain = static_cast<int32_t>(INT32_MAX - total);
int32_t remain = static_cast<int32_t>(kMaxCapacity - total);
char16_t *buf2 = str2.getBuffer(remain);
if (buf2 == nullptr) {
// if somehow memory allocation fail, return the test
@ -2410,14 +2412,19 @@ void UnicodeStringTest::TestLargeAppend() {
str2.releaseBuffer(remain);
dest.append(str2);
total += remain;
assertEquals("When a string of exactly the maximum size works", static_cast<int64_t>(INT32_MAX), total);
assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length());
assertEquals("When a string of exactly the maximum size works", static_cast<int64_t>(kMaxCapacity), total);
assertEquals("When a string of exactly the maximum size works", kMaxCapacity, dest.length());
assertFalse("dest is not bogus", dest.isBogus());
// Check that a string size+1 goes bogus
// Check that a string size+1 does not go bogus (one more byte reserved for NUL)
str2.truncate(1);
dest.append(str2);
total++;
assertFalse("dest should be not bogus", dest.isBogus());
// Check that a string size+2 goes bogus (beyond the byte reserved
// for NUL)
dest.append(str2);
total++;
assertTrue("dest should be bogus", dest.isBogus());
} else {
assertTrue("dest should be bogus", dest.isBogus());