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

ICU-10998 test for only-none before comparing with the current list of reordering codes

Browse Source 
X-SVN-Rev: 36018
This commit is contained in:
Markus Scherer 2014-07-09 23:36:19 +00:00
parent 9bc6f268fb
commit 1379df9789
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/source/i18n/rulebasedcollator.cpp
View File

@ -646,6 +646,9 @@ RuleBasedCollator::setReorderCodes(const int32_t *reorderCodes, int32_t length,
errorCode = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
if(length == 1 && reorderCodes[0] == UCOL_REORDER_CODE_NONE) {
length = 0;
}
if(length == settings->reorderCodesLength &&
uprv_memcmp(reorderCodes, settings->reorderCodes, length * 4) == 0) {
return;
@ -670,7 +673,7 @@ RuleBasedCollator::setReorderCodes(const int32_t *reorderCodes, int32_t length,
errorCode = U_MEMORY_ALLOCATION_ERROR;
return;
}
if(length == 0 || (length == 1 && reorderCodes[0] == UCOL_REORDER_CODE_NONE)) {
if(length == 0) {
ownedSettings->resetReordering();
} else {
uint8_t reorderTable[256];