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

ICU-21919 Fix buffer overflow bug in Dutch accented IJ titlecase

Browse source 
See #1990
This commit is contained in:
Elango Cheran 2022-02-22 18:28:12 +00:00 • committed by Elango
parent 5489287998
commit 4962050f47
5 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/common/ucasemap.cpp
View file

@ -437,6 +437,7 @@ constexpr uint8_t ACUTE_BYTE1 = u8"\u0301"[1];
*/
int32_t maybeTitleDutchIJ(const uint8_t *src, UChar32 c, int32_t start, int32_t segmentLimit,
ByteSink &sink, uint32_t options, icu::Edits *edits, UErrorCode &errorCode) {
U_ASSERT(start < segmentLimit);
int32_t index = start;
bool withAcute = false;
@ -594,7 +595,7 @@ ucasemap_internalUTF8ToTitle(
}
/* Special case Dutch IJ titlecasing */
if (titleStart+1 < index &&
if (titleLimit < index &&
caseLocale == UCASE_LOC_DUTCH) {
if (c < 0) {
c = ~c;

1
icu4c/source/common/ustrcase.cpp
View file

@ -416,6 +416,7 @@ namespace {
int32_t maybeTitleDutchIJ(const UChar *src, UChar32 c, int32_t start, int32_t segmentLimit,
UChar *dest, int32_t &destIndex, int32_t destCapacity, uint32_t options,
icu::Edits *edits) {
U_ASSERT(start < segmentLimit);
int32_t index = start;
bool withAcute = false;

4
icu4c/source/test/intltest/strcase.cpp
View file

@ -741,6 +741,9 @@ void StringCaseTest::TestDutchTitle() {
{u"íjabc\u0308", u"Íjabc\u0308", u"Í"},
{u"íj́abc\U0001D16E", u"ÍJ́abc\U0001D16E", u"ÍJ"},
{u"íjabc\u1ABE", u"Íjabc\u1ABE", u"Í"},
// Bug ICU-21919
{u"Í", u"Í", u""},
};
for (const auto& cas : dutchTitleTestCases) {
@ -763,7 +766,6 @@ void StringCaseTest::TestDutchTitle() {
testOptions
);
}
}
}
#endif

2
icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMapImpl.java
View file

@ -794,6 +794,8 @@ public final class CaseMapImpl {
private static <A extends Appendable> int maybeTitleDutchIJ(
CharSequence src, int c, int start, int segmentLimit,
A dest, int options, Edits edits) throws IOException {
assert start < segmentLimit;
int index = start;
boolean withAcute = false;

3
icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java
View file

@ -497,6 +497,9 @@ public final class UCharacterCaseTest extends TestFmwk
{"íjabc\u0308", "Íjabc\u0308", "Í"},
{"íj́abc\uD834\uDD6E", "ÍJ́abc\uD834\uDD6E", "ÍJ"},
{"íjabc\u1ABE", "Íjabc\u1ABE", "Í"},
// Bug ICU-21919
{"Í", "Í", ""},
};
for (String[] caseDatum : dutchIJCasesData) {