tools: update icu to 65.1

Update the version of the bundled ICU (deps/icu-small) to ICU version
65.2.

Fixes: https://github.com/nodejs/node/issues/30211
Fixes: https://github.com/nodejs/node/issues/29540

PR-URL: https://github.com/nodejs/node/pull/30232
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>

7 files changed, 67 insertions, 64 deletions

diff --git a/deps/icu-small/source/tools/genrb/derb.cpp b/deps/icu-small/source/tools/genrb/derb.cpp
index ac26d95be4..997b400129 100644
--- a/deps/icu-small/source/tools/genrb/derb.cpp
+++ b/deps/icu-small/source/tools/genrb/derb.cpp
@@ -631,7 +631,7 @@ static const char *getEncodingName(const char *encoding) {
     if (!(enc = ucnv_getStandardName(encoding, "MIME", &err))) {
         err = U_ZERO_ERROR;
         if (!(enc = ucnv_getStandardName(encoding, "IANA", &err))) {
-            ;
+            // do nothing
         }
     }
 
diff --git a/deps/icu-small/source/tools/genrb/filterrb.cpp b/deps/icu-small/source/tools/genrb/filterrb.cpp
index d62d185d77..dcc02fc621 100644
--- a/deps/icu-small/source/tools/genrb/filterrb.cpp
+++ b/deps/icu-small/source/tools/genrb/filterrb.cpp
@@ -23,6 +23,9 @@ ResKeyPath::ResKeyPath(const std::string& path, UErrorCode& status) {
         status = U_PARSE_ERROR;
         return;
     }
+    if (path.length() == 1) {
+        return;
+    }
     size_t i;
     size_t j = 0;
     while (true) {
diff --git a/deps/icu-small/source/tools/genrb/genrb.cpp b/deps/icu-small/source/tools/genrb/genrb.cpp
index 885f3039bf..6f3a13a0a6 100644
--- a/deps/icu-small/source/tools/genrb/genrb.cpp
+++ b/deps/icu-small/source/tools/genrb/genrb.cpp
@@ -205,10 +205,10 @@ main(int argc,
                 "\t-c or --copyright        include copyright notice\n");
         fprintf(stderr,
                 "\t-e or --encoding         encoding of source files\n"
-                "\t-d of --destdir          destination directory, followed by the path, defaults to %s\n"
-                "\t-s or --sourcedir        source directory for files followed by path, defaults to %s\n"
+                "\t-d or --destdir          destination directory, followed by the path, defaults to '%s'\n"
+                "\t-s or --sourcedir        source directory for files followed by path, defaults to '%s'\n"
                 "\t-i or --icudatadir       directory for locating any needed intermediate data files,\n"
-                "\t                         followed by path, defaults to %s\n",
+                "\t                         followed by path, defaults to '%s'\n",
                 u_getDataDirectory(), u_getDataDirectory(), u_getDataDirectory());
         fprintf(stderr,
                 "\t-j or --write-java       write a Java ListResourceBundle for ICU4J, followed by optional encoding\n"
@@ -240,7 +240,7 @@ main(int argc,
                 "\t                           (--writePoolBundle and --usePoolBundle cannot be combined)\n");
         fprintf(stderr,
                 "\t      --filterDir          Input directory where filter files are available.\n"
-                "\t                           For more on filter files, see Python buildtool.\n");
+                "\t                           For more on filter files, see ICU Data Build Tool.\n");
 
         return illegalArg ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR;
     }
diff --git a/deps/icu-small/source/tools/genrb/parse.cpp b/deps/icu-small/source/tools/genrb/parse.cpp
index 884d5d5666..18a8c76dbc 100644
--- a/deps/icu-small/source/tools/genrb/parse.cpp
+++ b/deps/icu-small/source/tools/genrb/parse.cpp
@@ -274,11 +274,11 @@ expect(ParseState* state, enum ETokenType expectedToken, struct UString **tokenV
     }
 }
 
-static char *getInvariantString(ParseState* state, uint32_t *line, struct UString *comment, UErrorCode *status)
+static char *getInvariantString(ParseState* state, uint32_t *line, struct UString *comment,
+                                int32_t &stringLength, UErrorCode *status)
 {
     struct UString *tokenValue;
     char           *result;
-    uint32_t        count;
 
     expect(state, TOK_STRING, &tokenValue, comment, line, status);
 
@@ -287,14 +287,13 @@ static char *getInvariantString(ParseState* state, uint32_t *line, struct UStrin
         return NULL;
     }
 
-    count = u_strlen(tokenValue->fChars);
-    if(!uprv_isInvariantUString(tokenValue->fChars, count)) {
+    if(!uprv_isInvariantUString(tokenValue->fChars, tokenValue->fLength)) {
         *status = U_INVALID_FORMAT_ERROR;
         error(*line, "invariant characters required for table keys, binary data, etc.");
         return NULL;
     }
 
-    result = static_cast<char *>(uprv_malloc(count+1));
+    result = static_cast<char *>(uprv_malloc(tokenValue->fLength+1));
 
     if (result == NULL)
     {
@@ -302,7 +301,8 @@ static char *getInvariantString(ParseState* state, uint32_t *line, struct UStrin
         return NULL;
     }
 
-    u_UCharsToChars(tokenValue->fChars, result, count+1);
+    u_UCharsToChars(tokenValue->fChars, result, tokenValue->fLength+1);
+    stringLength = tokenValue->fLength;
     return result;
 }
 
@@ -1371,7 +1371,6 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US
     int32_t            value;
     UBool              readToken = FALSE;
     char              *stopstring;
-    uint32_t           len;
     struct UString     memberComments;
 
     IntVectorResource *result = intvector_open(state->bundle, tag, comment, status);
@@ -1404,7 +1403,8 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US
             return result;
         }
 
-        string = getInvariantString(state, NULL, NULL, status);
+        int32_t stringLength;
+        string = getInvariantString(state, NULL, NULL, stringLength, status);
 
         if (U_FAILURE(*status))
         {
@@ -1414,9 +1414,9 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US
 
         /* For handling illegal char in the Intvector */
         value = uprv_strtoul(string, &stopstring, 0);/* make intvector support decimal,hexdigit,octal digit ranging from -2^31-2^32-1*/
-        len=(uint32_t)(stopstring-string);
+        int32_t len = (int32_t)(stopstring-string);
 
-        if(len==uprv_strlen(string))
+        if(len==stringLength)
         {
             result->add(value, *status);
             uprv_free(string);
@@ -1454,7 +1454,8 @@ static struct SResource *
 parseBinary(ParseState* state, char *tag, uint32_t startline, const struct UString *comment, UErrorCode *status)
 {
     uint32_t line;
-    LocalMemory<char> string(getInvariantString(state, &line, NULL, status));
+    int32_t stringLength;
+    LocalMemory<char> string(getInvariantString(state, &line, NULL, stringLength, status));
     if (string.isNull() || U_FAILURE(*status))
     {
         return NULL;
@@ -1470,46 +1471,45 @@ parseBinary(ParseState* state, char *tag, uint32_t startline, const struct UStri
         printf(" binary %s at line %i \n",  (tag == NULL) ? "(null)" : tag, (int)startline);
     }
 
-    uint32_t count = (uint32_t)uprv_strlen(string.getAlias());
-    if (count > 0){
-        if((count % 2)==0){
-            LocalMemory<uint8_t> value;
-            if (value.allocateInsteadAndCopy(count) == NULL)
-            {
-                *status = U_MEMORY_ALLOCATION_ERROR;
-                return NULL;
-            }
-
-            char toConv[3] = {'\0', '\0', '\0'};
-            for (uint32_t i = 0; i < count; i += 2)
-            {
-                toConv[0] = string[i];
-                toConv[1] = string[i + 1];
+    LocalMemory<uint8_t> value;
+    int32_t count = 0;
+    if (stringLength > 0 && value.allocateInsteadAndCopy(stringLength) == NULL)
+    {
+        *status = U_MEMORY_ALLOCATION_ERROR;
+        return NULL;
+    }
 
-                char *stopstring;
-                value[i >> 1] = (uint8_t) uprv_strtoul(toConv, &stopstring, 16);
-                uint32_t len=(uint32_t)(stopstring-toConv);
+    char toConv[3] = {'\0', '\0', '\0'};
+    for (int32_t i = 0; i < stringLength;)
+    {
+        // Skip spaces (which may have been line endings).
+        char c0 = string[i++];
+        if (c0 == ' ') { continue; }
+        if (i == stringLength) {
+            *status=U_INVALID_CHAR_FOUND;
+            error(line, "Encountered invalid binary value (odd number of hex digits)");
+            return NULL;
+        }
+        toConv[0] = c0;
+        toConv[1] = string[i++];
 
-                if(len!=2)
-                {
-                    *status=U_INVALID_CHAR_FOUND;
-                    return NULL;
-                }
-            }
+        char *stopstring;
+        value[count++] = (uint8_t) uprv_strtoul(toConv, &stopstring, 16);
+        uint32_t len=(uint32_t)(stopstring-toConv);
 
-            return bin_open(state->bundle, tag, count >> 1, value.getAlias(), NULL, comment, status);
-        }
-        else
+        if(len!=2)
         {
-            *status = U_INVALID_CHAR_FOUND;
-            error(line, "Encountered invalid binary value (length is odd)");
+            *status=U_INVALID_CHAR_FOUND;
+            error(line, "Encountered invalid binary value (not all pairs of hex digits)");
             return NULL;
         }
     }
-    else
-    {
+
+    if (count == 0) {
         warning(startline, "Encountered empty binary value");
         return bin_open(state->bundle, tag, 0, NULL, "", comment, status);
+    } else {
+        return bin_open(state->bundle, tag, count, value.getAlias(), NULL, comment, status);
     }
 }
 
@@ -1520,9 +1520,9 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr
     int32_t           value;
     char             *string;
     char             *stopstring;
-    uint32_t          len;
 
-    string = getInvariantString(state, NULL, NULL, status);
+    int32_t stringLength;
+    string = getInvariantString(state, NULL, NULL, stringLength, status);
 
     if (string == NULL || U_FAILURE(*status))
     {
@@ -1541,7 +1541,7 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr
         printf(" integer %s at line %i \n",  (tag == NULL) ? "(null)" : tag, (int)startline);
     }
 
-    if (uprv_strlen(string) <= 0)
+    if (stringLength == 0)
     {
         warning(startline, "Encountered empty integer. Default value is 0.");
     }
@@ -1549,8 +1549,8 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr
     /* Allow integer support for hexdecimal, octal digit and decimal*/
     /* and handle illegal char in the integer*/
     value = uprv_strtoul(string, &stopstring, 0);
-    len=(uint32_t)(stopstring-string);
-    if(len==uprv_strlen(string))
+    int32_t len = (int32_t)(stopstring-string);
+    if(len==stringLength)
     {
         result = int_open(state->bundle, tag, value, comment, status);
     }
@@ -1567,7 +1567,8 @@ static struct SResource *
 parseImport(ParseState* state, char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status)
 {
     uint32_t          line;
-    LocalMemory<char> filename(getInvariantString(state, &line, NULL, status));
+    int32_t stringLength;
+    LocalMemory<char> filename(getInvariantString(state, &line, NULL, stringLength, status));
     if (U_FAILURE(*status))
     {
         return NULL;
@@ -1628,12 +1629,11 @@ parseInclude(ParseState* state, char *tag, uint32_t startline, const struct UStr
 
     UCHARBUF *ucbuf;
     char     *fullname = NULL;
-    int32_t  count     = 0;
     const char* cp = NULL;
     const UChar* uBuffer = NULL;
 
-    filename = getInvariantString(state, &line, NULL, status);
-    count     = (int32_t)uprv_strlen(filename);
+    int32_t stringLength;
+    filename = getInvariantString(state, &line, NULL, stringLength, status);
 
     if (U_FAILURE(*status))
     {
@@ -1652,7 +1652,7 @@ parseInclude(ParseState* state, char *tag, uint32_t startline, const struct UStr
         printf(" include %s at line %i \n",  (tag == NULL) ? "(null)" : tag, (int)startline);
     }
 
-    fullname = (char *) uprv_malloc(state->inputdirLength + count + 2);
+    fullname = (char *) uprv_malloc(state->inputdirLength + stringLength + 2);
     /* test for NULL */
     if(fullname == NULL)
     {
diff --git a/deps/icu-small/source/tools/genrb/reslist.cpp b/deps/icu-small/source/tools/genrb/reslist.cpp
index bf57516047..3186c781e9 100644
--- a/deps/icu-small/source/tools/genrb/reslist.cpp
+++ b/deps/icu-small/source/tools/genrb/reslist.cpp
@@ -1371,7 +1371,7 @@ SRBRoot::compactKeys(UErrorCode &errorCode) {
     }
 
     int32_t keysCount = fUsePoolBundle->fKeysCount + fKeysCount;
-    if (U_FAILURE(errorCode) || fKeysCount == 0 || fKeyMap != NULL) {
+    if (U_FAILURE(errorCode) || fKeyMap != NULL) {
         return;
     }
     map = (KeyMapEntry *)uprv_malloc(keysCount * sizeof(KeyMapEntry));
diff --git a/deps/icu-small/source/tools/genrb/rle.c b/deps/icu-small/source/tools/genrb/rle.c
index 08495c2b4f..3d034f78ca 100644
--- a/deps/icu-small/source/tools/genrb/rle.c
+++ b/deps/icu-small/source/tools/genrb/rle.c
@@ -91,14 +91,14 @@ encodeRunByte(uint16_t* buffer,uint16_t* bufLimit, uint8_t value, int32_t length
     return buffer;
 }
 
-#define APPEND( buffer, bufLimit, value, num, status){  \
+#define APPEND( buffer, bufLimit, value, num, status) UPRV_BLOCK_MACRO_BEGIN { \
     if(buffer<bufLimit){                    \
         *buffer++=(value);                  \
     }else{                                  \
         *status = U_BUFFER_OVERFLOW_ERROR;  \
     }                                       \
     num++;                                  \
-}
+} UPRV_BLOCK_MACRO_END
 
 /**
  * Encode a run, possibly a degenerate run (of < 4 values).
diff --git a/deps/icu-small/source/tools/genrb/ustr.h b/deps/icu-small/source/tools/genrb/ustr.h
index 91483d1f0f..8a69e9d4d5 100644
--- a/deps/icu-small/source/tools/genrb/ustr.h
+++ b/deps/icu-small/source/tools/genrb/ustr.h
@@ -22,7 +22,7 @@
 
 #include "unicode/utypes.h"
 
-#define U_APPEND_CHAR32(c,target,len) {                         \
+#define U_APPEND_CHAR32(c,target,len) UPRV_BLOCK_MACRO_BEGIN {  \
     if (c <= 0xffff)                                            \
     {                                                           \
         *(target)++ = (UChar) c;                                \
@@ -35,9 +35,9 @@
         len=2;                                                  \
         target +=2;                                             \
     }                                                           \
-}
+} UPRV_BLOCK_MACRO_END
 
-#define U_APPEND_CHAR32_ONLY(c,target) {                             \
+#define U_APPEND_CHAR32_ONLY(c,target) UPRV_BLOCK_MACRO_BEGIN { \
     if (c <= 0xffff)                                            \
     {                                                           \
         *(target)++ = (UChar) c;                                \
@@ -48,7 +48,7 @@
         target[1] = U16_TRAIL(c);                               \
         target +=2;                                             \
     }                                                           \
-}
+} UPRV_BLOCK_MACRO_END
 
 /* A C representation of a string "object" (to avoid realloc all the time) */
 struct UString {