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 9

ICU-12825 Fixing icu4c spoof checker issues #12825 and #12815.

Browse source 
X-SVN-Rev: 39493
This commit is contained in:
Shane Carr 2016-10-28 17:56:22 +00:00
parent 173981e642
commit d1ee641e2e
4 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/i18n/scriptset.cpp
View file

@ -258,7 +258,7 @@ void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) {
while (TRUE) {
script_count = uscript_getScriptExtensions(
codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus);
codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus);
if (internalStatus == U_BUFFER_OVERFLOW_ERROR) {
// Need to allocate more space
if (scripts.resize(script_count) == NULL) {

7
icu4c/source/i18n/uspoof.cpp
View file

@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
return dest;
}
// Check that at least one of the CONFUSABLE flags is turned on. If not,
// return an error.
if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return dest;
}
UnicodeString nfdId;
gNfdNormalizer->normalize(id, nfdId, *status);

25
icu4c/source/test/intltest/itspoof.cpp
View file

@ -88,6 +88,8 @@ void IntlTestSpoof::runIndexedTest( int32_t index, UBool exec, const char* &name
TESTCASE_AUTO(testRestrictionLevel);
TESTCASE_AUTO(testMixedNumbers);
TESTCASE_AUTO(testBug12153);
TESTCASE_AUTO(testBug12825);
TESTCASE_AUTO(testBug12815);
TESTCASE_AUTO_END;
}
@ -657,4 +659,27 @@ void IntlTestSpoof::testBug12153() {
TEST_ASSERT_SUCCESS(status);
}
// uspoof_checkUnicodeString should NOT have an infinite loop.
void IntlTestSpoof::testBug12825() {
UErrorCode status = U_ZERO_ERROR;
LocalUSpoofCheckerPointer sc(uspoof_open(&status));
TEST_ASSERT_SUCCESS(status);
uspoof_setChecks(sc.getAlias(), USPOOF_ALL_CHECKS | USPOOF_AUX_INFO, &status);
TEST_ASSERT_SUCCESS(status);
uspoof_checkUnicodeString(sc.getAlias(), UnicodeString("\\u30FB").unescape(), NULL, &status);
TEST_ASSERT_SUCCESS(status);
}
// uspoof_getSkeleton should NOT set an ILLEGAL_ARGUMENT_EXCEPTION.
void IntlTestSpoof::testBug12815() {
UErrorCode status = U_ZERO_ERROR;
LocalUSpoofCheckerPointer sc(uspoof_open(&status));
TEST_ASSERT_SUCCESS(status);
uspoof_setChecks(sc.getAlias(), USPOOF_RESTRICTION_LEVEL, &status);
TEST_ASSERT_SUCCESS(status);
UnicodeString result;
uspoof_getSkeletonUnicodeString(sc.getAlias(), 0, UnicodeString("hello world"), result, &status);
TEST_ASSERT_SUCCESS(status);
}
#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO */

4
icu4c/source/test/intltest/itspoof.h
View file

@ -46,6 +46,10 @@ public:
void testBug12153();
void testBug12825();
void testBug12815();
// Internal function to run a single skeleton test case.
void checkSkeleton(const USpoofChecker *sc, uint32_t flags,
const char *input, const char *expected, int32_t lineNum);