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 heap-buffer-overflow when UnicodeString size too large

Browse source 
See #3416
This commit is contained in:
Frank Tang 2025-02-25 21:02:23 +00:00 • committed by Frank Yung-Fong Tang
parent 7aae07acc9
commit 0b88b1c754
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1945,6 +1945,11 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity,
growCapacity = newCapacity;
} else if(newCapacity <= US_STACKBUF_SIZE && growCapacity > US_STACKBUF_SIZE) {
growCapacity = US_STACKBUF_SIZE;
} else if(newCapacity > growCapacity) {
return false; // bad inputs
}
if(growCapacity > kMaxCapacity) {
return false;
}
// save old values

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

@ -77,6 +77,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* &
TESTCASE_AUTO(TestNullPointers);
TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf);
TESTCASE_AUTO(TestLargeAppend);
TESTCASE_AUTO(TestLargeMemory);
TESTCASE_AUTO(TestU16StringView);
TESTCASE_AUTO(TestWStringView);
TESTCASE_AUTO_END;
@ -2351,6 +2352,18 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
assertEquals("", u"abbcdcde", str);
}
void UnicodeStringTest::TestLargeMemory() {
#if U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED
if(quick) { return; }
IcuTestErrorCode status(*this, "TestLargeMemory");
constexpr uint32_t len = 2147483643;
char16_t *buf = new char16_t[len];
if (buf == nullptr) { return; }
uprv_memset(buf, 0x4e, len * 2);
icu::UnicodeString test(buf, len);
delete [] buf;
#endif
}
void UnicodeStringTest::TestLargeAppend() {
if(quick) return;

1
icu4c/source/test/intltest/ustrtest.h
View file

@ -92,6 +92,7 @@ public:
void TestUnicodeStringImplementsAppendable();
void TestSizeofUnicodeString();
void TestMoveSwap();
void TestLargeMemory();
void TestUInt16Pointers();
void TestWCharPointers();