AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11414 uspoof, freeze the recommended and inclusion sets.

Browse Source 
X-SVN-Rev: 36823
This commit is contained in:
Andy Heninger 2014-12-08 19:56:43 +00:00
parent 00c6bb79bf
commit 40271c5742
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/i18n/uspoof.cpp
View File

@ -58,6 +58,7 @@ static void U_CALLCONV initializeStatics(UErrorCode &status) {
"[\\u0027\\u002D-\\u002E\\u003A\\u00B7\\u0375\\u058A\\u05F3-\\u05F4"
"\\u06FD-\\u06FE\\u0F0B\\u200C-\\u200D\\u2010\\u2019\\u2027\\u30A0\\u30FB]";
gInclusionSet = new UnicodeSet(UnicodeString(inclusionPat, -1, US_INV), status);
gInclusionSet->freeze();
// Note: data from http://unicode.org/Public/security/latest/xidmodifications.txt version 7.0.0
// No tooling to generate this from the .txt file, hand extracted with editor macros.
@ -127,6 +128,7 @@ static void U_CALLCONV initializeStatics(UErrorCode &status) {
"\\uFA27-\\uFA29\\U0001B000-\\U0001B001\\U00020000-\\U0002A6D6\\U0002A700-\\U0002B734"
"\\U0002B740-\\U0002B81D]";
gRecommendedSet = new UnicodeSet(UnicodeString(recommendedPat, -1, US_INV), status);
gRecommendedSet->freeze();
gNfdNormalizer = Normalizer2::getNFDInstance(status);
ucln_i18n_registerCleanup(UCLN_I18N_SPOOF, uspoof_cleanup);
}

17
icu4c/source/test/cintltst/spooftest.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2009-2013, International Business Machines Corporation and
* Copyright (c) 2009-2014, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -529,6 +529,21 @@ static void TestUSpoofCAPI(void) {
status = U_ZERO_ERROR;
TEST_TEARDOWN;
/*
* get Inclusion and Recommended sets
*/
TEST_SETUP
USet *inclusions = uspoof_getInclusionSet(&status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT_EQ(TRUE, uset_isFrozen(inclusions));
status = U_ZERO_ERROR;
USet *recommended = uspoof_getRecommendedSet(&status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT_EQ(TRUE, uset_isFrozen(recommended));
TEST_TEARDOWN;
}
#endif /* UCONFIG_NO_REGULAR_EXPRESSIONS */