152 lines
6.2 KiB
Diff
152 lines
6.2 KiB
Diff
Backport of [PATCH] ICU-22973 Fix buffer overflow by using CharString to icu 67.1
|
|
|
|
diff -ru icu.orig/source/tools/genrb/parse.cpp icu/source/tools/genrb/parse.cpp
|
|
--- icu.orig/source/tools/genrb/parse.cpp 2020-04-22 22:04:20.000000000 +0200
|
|
+++ icu/source/tools/genrb/parse.cpp 2025-07-08 12:20:47.216586739 +0200
|
|
@@ -818,7 +818,7 @@
|
|
struct UString *tokenValue;
|
|
struct UString comment;
|
|
enum ETokenType token;
|
|
- char subtag[1024];
|
|
+ CharString subtag;
|
|
UnicodeString rules;
|
|
UBool haveRules = FALSE;
|
|
UVersionInfo version;
|
|
@@ -854,15 +854,15 @@
|
|
return NULL;
|
|
}
|
|
|
|
- u_UCharsToChars(tokenValue->fChars, subtag, u_strlen(tokenValue->fChars) + 1);
|
|
-
|
|
+ subtag.clear();
|
|
+ subtag.appendInvariantChars(tokenValue->fChars, u_strlen(tokenValue->fChars), *status);
|
|
if (U_FAILURE(*status))
|
|
{
|
|
res_close(result);
|
|
return NULL;
|
|
}
|
|
|
|
- member = parseResource(state, subtag, NULL, status);
|
|
+ member = parseResource(state, subtag.data(), NULL, status);
|
|
|
|
if (U_FAILURE(*status))
|
|
{
|
|
@@ -873,7 +873,7 @@
|
|
{
|
|
// Ignore the parsed resources, continue parsing.
|
|
}
|
|
- else if (uprv_strcmp(subtag, "Version") == 0 && member->isString())
|
|
+ else if (uprv_strcmp(subtag.data(), "Version") == 0 && member->isString())
|
|
{
|
|
StringResource *sr = static_cast<StringResource *>(member);
|
|
char ver[40];
|
|
@@ -890,11 +890,11 @@
|
|
result->add(member, line, *status);
|
|
member = NULL;
|
|
}
|
|
- else if(uprv_strcmp(subtag, "%%CollationBin")==0)
|
|
+ else if(uprv_strcmp(subtag.data(), "%%CollationBin")==0)
|
|
{
|
|
/* discard duplicate %%CollationBin if any*/
|
|
}
|
|
- else if (uprv_strcmp(subtag, "Sequence") == 0 && member->isString())
|
|
+ else if (uprv_strcmp(subtag.data(), "Sequence") == 0 && member->isString())
|
|
{
|
|
StringResource *sr = static_cast<StringResource *>(member);
|
|
rules = sr->fString;
|
|
@@ -1047,7 +1047,7 @@
|
|
struct UString *tokenValue;
|
|
struct UString comment;
|
|
enum ETokenType token;
|
|
- char subtag[1024], typeKeyword[1024];
|
|
+ CharString subtag, typeKeyword;
|
|
uint32_t line;
|
|
|
|
result = table_open(state->bundle, tag, NULL, status);
|
|
@@ -1089,7 +1089,8 @@
|
|
return NULL;
|
|
}
|
|
|
|
- u_UCharsToChars(tokenValue->fChars, subtag, u_strlen(tokenValue->fChars) + 1);
|
|
+ subtag.clear();
|
|
+ subtag.appendInvariantChars(tokenValue->fChars, u_strlen(tokenValue->fChars), *status);
|
|
|
|
if (U_FAILURE(*status))
|
|
{
|
|
@@ -1097,9 +1098,9 @@
|
|
return NULL;
|
|
}
|
|
|
|
- if (uprv_strcmp(subtag, "default") == 0)
|
|
+ if (uprv_strcmp(subtag.data(), "default") == 0)
|
|
{
|
|
- member = parseResource(state, subtag, NULL, status);
|
|
+ member = parseResource(state, subtag.data(), NULL, status);
|
|
|
|
if (U_FAILURE(*status))
|
|
{
|
|
@@ -1118,22 +1119,29 @@
|
|
if(token == TOK_OPEN_BRACE) {
|
|
token = getToken(state, &tokenValue, &comment, &line, status);
|
|
TableResource *collationRes;
|
|
- if (keepCollationType(subtag)) {
|
|
- collationRes = table_open(state->bundle, subtag, NULL, status);
|
|
+ if (keepCollationType(subtag.data())) {
|
|
+ collationRes = table_open(state->bundle, subtag.data(), NULL, status);
|
|
} else {
|
|
collationRes = NULL;
|
|
}
|
|
// need to parse the collation data regardless
|
|
- collationRes = addCollation(state, collationRes, subtag, startline, status);
|
|
+ collationRes = addCollation(state, collationRes, subtag.data(), startline, status);
|
|
if (collationRes != NULL) {
|
|
result->add(collationRes, startline, *status);
|
|
}
|
|
} else if(token == TOK_COLON) { /* right now, we'll just try to see if we have aliases */
|
|
/* we could have a table too */
|
|
token = peekToken(state, 1, &tokenValue, &line, &comment, status);
|
|
- u_UCharsToChars(tokenValue->fChars, typeKeyword, u_strlen(tokenValue->fChars) + 1);
|
|
- if(uprv_strcmp(typeKeyword, "alias") == 0) {
|
|
- member = parseResource(state, subtag, NULL, status);
|
|
+ typeKeyword.clear();
|
|
+ typeKeyword.appendInvariantChars(tokenValue->fChars, u_strlen(tokenValue->fChars), *status);
|
|
+ if (U_FAILURE(*status))
|
|
+ {
|
|
+ res_close(result);
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ if(uprv_strcmp(typeKeyword.data(), "alias") == 0) {
|
|
+ member = parseResource(state, subtag.data(), NULL, status);
|
|
if (U_FAILURE(*status))
|
|
{
|
|
res_close(result);
|
|
@@ -1175,7 +1183,7 @@
|
|
struct UString *tokenValue=NULL;
|
|
struct UString comment;
|
|
enum ETokenType token;
|
|
- char subtag[1024];
|
|
+ CharString subtag;
|
|
uint32_t line;
|
|
UBool readToken = FALSE;
|
|
|
|
@@ -1214,7 +1222,8 @@
|
|
}
|
|
|
|
if(uprv_isInvariantUString(tokenValue->fChars, -1)) {
|
|
- u_UCharsToChars(tokenValue->fChars, subtag, u_strlen(tokenValue->fChars) + 1);
|
|
+ subtag.clear();
|
|
+ subtag.appendInvariantChars(tokenValue->fChars, u_strlen(tokenValue->fChars), *status);
|
|
} else {
|
|
*status = U_INVALID_FORMAT_ERROR;
|
|
error(line, "invariant characters required for table keys");
|
|
@@ -1227,7 +1236,7 @@
|
|
return NULL;
|
|
}
|
|
|
|
- member = parseResource(state, subtag, &comment, status);
|
|
+ member = parseResource(state, subtag.data(), &comment, status);
|
|
|
|
if (member == NULL || U_FAILURE(*status))
|
|
{
|