Skip to content

Commit bce0013

Browse files
srl295evanlucas
authored andcommitted
deps: ICU 58.2 bump
Bump ICU from 58.1 to 58.2 No feature changes. Bug fixes. * This commit contains the actual ICU source code and data. * CLDR 30.0.3 ( was 30.0.2) * Timezone 2016j ( was 2016g ) ICU Details: http://site.icu-project.org/download/58#TOC-Updates-in-ICU-58.2 PR-URL: #10206 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 80e798e commit bce0013

File tree

8 files changed

+14
-15
lines changed

8 files changed

+14
-15
lines changed

deps/icu-small/source/common/locmap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr
10221022
// GetLocaleInfo() maps such LCID to "ku". However, CLDR uses "ku" for
10231023
// Northern Kurdish and "ckb" for Central Kurdish. For this reason, we cannot
10241024
// use the Windows API to resolve locale ID for this specific case.
1025-
if (hostid & 0x3FF != 0x92) {
1025+
if ((hostid & 0x3FF) != 0x92) {
10261026
int32_t tmpLen = 0;
10271027
char locName[157]; /* ULOC_FULLNAME_CAPACITY */
10281028

deps/icu-small/source/common/ucasemap.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ appendUChar(uint8_t *dest, int32_t destIndex, int32_t destCapacity, UChar c) {
200200
return -1; // integer overflow
201201
}
202202
int32_t limit=destIndex+length;
203-
if(limit<destCapacity) {
203+
if(limit<=destCapacity) {
204204
U8_APPEND_UNSAFE(dest, destIndex, c);
205205
}
206206
return limit;
@@ -422,6 +422,9 @@ ucasemap_internalUTF8ToTitle(const UCaseMap *csm,
422422
src, &csc,
423423
titleLimit, idx,
424424
pErrorCode);
425+
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
426+
*pErrorCode=U_ZERO_ERROR;
427+
}
425428
if(U_FAILURE(*pErrorCode)) {
426429
return destIndex;
427430
}

deps/icu-small/source/common/unicode/uvernum.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* This value will change in the subsequent releases of ICU
6565
* @stable ICU 2.6
6666
*/
67-
#define U_ICU_VERSION_MINOR_NUM 1
67+
#define U_ICU_VERSION_MINOR_NUM 2
6868

6969
/** The current ICU patchlevel version as an integer.
7070
* This value will change in the subsequent releases of ICU
@@ -119,7 +119,7 @@
119119
* This value will change in the subsequent releases of ICU
120120
* @stable ICU 2.4
121121
*/
122-
#define U_ICU_VERSION "58.1"
122+
#define U_ICU_VERSION "58.2"
123123

124124
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
125125
* This value will change in the subsequent releases of ICU
@@ -131,7 +131,7 @@
131131
/** Data version in ICU4C.
132132
* @internal ICU 4.4 Internal Use Only
133133
**/
134-
#define U_ICU_DATA_VERSION "58.1"
134+
#define U_ICU_DATA_VERSION "58.2"
135135
#endif /* U_HIDE_INTERNAL_API */
136136

137137
/*===========================================================================

deps/icu-small/source/common/ustrcase.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ ustrcase_internalToTitle(const UCaseMap *csm,
305305
src, &csc,
306306
titleLimit, idx,
307307
pErrorCode);
308+
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
309+
*pErrorCode=U_ZERO_ERROR;
310+
}
308311
if(U_FAILURE(*pErrorCode)) {
309312
return destIndex;
310313
}
1.39 KB
Binary file not shown.

deps/icu-small/source/i18n/digitlst.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
# endif
6161
#endif
6262

63-
#if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
64-
# if U_PLATFORM == U_PF_CYGWIN
63+
#if U_USE_STRTOD_L
64+
# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
6565
# include <locale.h>
6666
# else
6767
# include <xlocale.h>

deps/icu-small/source/i18n/scriptset.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) {
258258

259259
while (TRUE) {
260260
script_count = uscript_getScriptExtensions(
261-
codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus);
261+
codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus);
262262
if (internalStatus == U_BUFFER_OVERFLOW_ERROR) {
263263
// Need to allocate more space
264264
if (scripts.resize(script_count) == NULL) {

deps/icu-small/source/i18n/uspoof.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
646646
return dest;
647647
}
648648

649-
// Check that at least one of the CONFUSABLE flags is turned on. If not,
650-
// return an error.
651-
if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
652-
*status = U_ILLEGAL_ARGUMENT_ERROR;
653-
return dest;
654-
}
655-
656649
UnicodeString nfdId;
657650
gNfdNormalizer->normalize(id, nfdId, *status);
658651

0 commit comments

Comments
 (0)