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

ICU-11761 bug fix: always begin 16BitUnits[] with a 0 for empty resources, see uresdata.h (was almost always true before r37644)

Browse Source 
X-SVN-Rev: 37654
This commit is contained in:
Markus Scherer 2015-07-08 22:07:52 +00:00
parent 5d7b60d863
commit c1f7be3ffe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/tools/genrb/reslist.cpp
View File

@ -1011,6 +1011,12 @@ SRBRoot::SRBRoot(const UString *comment, UBool isPoolBundle, UErrorCode &errorCo
return;
}
if (gFormatVersion > 1) {
// f16BitUnits must start with a zero for empty resources.
// We might be able to omit it if there are no empty 16-bit resources.
f16BitUnits.append((UChar)0);
}
fKeys = (char *) uprv_malloc(sizeof(char) * KEY_SPACE_SIZE);
fRoot = new TableResource(this, NULL, comment, errorCode);
if (fKeys == NULL || fRoot == NULL || U_FAILURE(errorCode)) {
@ -1389,9 +1395,6 @@ SRBRoot::compactStringsV2(UHashtable *stringSet, UErrorCode &errorCode) {
if (U_FAILURE(errorCode)) {
return;
}
/* insert the initial NUL */
f16BitUnits.append((UChar)0);
++f16BitStringsLength;
for (int32_t pos = UHASH_FIRST, i = 0; i < count; ++i) {
array[i] = (StringResource *)uhash_nextElement(stringSet, &pos)->key.pointer;
}
@ -1462,5 +1465,6 @@ SRBRoot::compactStringsV2(UHashtable *stringSet, UErrorCode &errorCode) {
res->fSame = NULL;
res->fWritten = TRUE;
}
assert(f16BitUnits.length() <= f16BitStringsLength);
// +1 to account for the initial zero in f16BitUnits
assert(f16BitUnits.length() <= (f16BitStringsLength + 1));
}