diff options
Diffstat (limited to 'deps/icu-small')
-rw-r--r-- | deps/icu-small/source/common/locmap.c | 2 | ||||
-rw-r--r-- | deps/icu-small/source/common/ucasemap.cpp | 5 | ||||
-rw-r--r-- | deps/icu-small/source/common/unicode/uvernum.h | 6 | ||||
-rw-r--r-- | deps/icu-small/source/common/ustrcase.cpp | 3 | ||||
-rw-r--r-- | deps/icu-small/source/data/in/icudt58l.dat | bin | 2680800 -> 2682224 bytes | |||
-rw-r--r-- | deps/icu-small/source/i18n/digitlst.cpp | 4 | ||||
-rw-r--r-- | deps/icu-small/source/i18n/scriptset.cpp | 2 | ||||
-rw-r--r-- | deps/icu-small/source/i18n/uspoof.cpp | 7 |
8 files changed, 14 insertions, 15 deletions
diff --git a/deps/icu-small/source/common/locmap.c b/deps/icu-small/source/common/locmap.c index 0d0aac42e1..1dba67a092 100644 --- a/deps/icu-small/source/common/locmap.c +++ b/deps/icu-small/source/common/locmap.c @@ -1022,7 +1022,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr // GetLocaleInfo() maps such LCID to "ku". However, CLDR uses "ku" for // Northern Kurdish and "ckb" for Central Kurdish. For this reason, we cannot // use the Windows API to resolve locale ID for this specific case. - if (hostid & 0x3FF != 0x92) { + if ((hostid & 0x3FF) != 0x92) { int32_t tmpLen = 0; char locName[157]; /* ULOC_FULLNAME_CAPACITY */ diff --git a/deps/icu-small/source/common/ucasemap.cpp b/deps/icu-small/source/common/ucasemap.cpp index c0d56c2873..0576a26ddd 100644 --- a/deps/icu-small/source/common/ucasemap.cpp +++ b/deps/icu-small/source/common/ucasemap.cpp @@ -200,7 +200,7 @@ appendUChar(uint8_t *dest, int32_t destIndex, int32_t destCapacity, UChar c) { return -1; // integer overflow } int32_t limit=destIndex+length; - if(limit<destCapacity) { + if(limit<=destCapacity) { U8_APPEND_UNSAFE(dest, destIndex, c); } return limit; @@ -422,6 +422,9 @@ ucasemap_internalUTF8ToTitle(const UCaseMap *csm, src, &csc, titleLimit, idx, pErrorCode); + if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) { + *pErrorCode=U_ZERO_ERROR; + } if(U_FAILURE(*pErrorCode)) { return destIndex; } diff --git a/deps/icu-small/source/common/unicode/uvernum.h b/deps/icu-small/source/common/unicode/uvernum.h index fb7b48bc07..5590f9a5cc 100644 --- a/deps/icu-small/source/common/unicode/uvernum.h +++ b/deps/icu-small/source/common/unicode/uvernum.h @@ -64,7 +64,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 2 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -119,7 +119,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "58.1" +#define U_ICU_VERSION "58.2" /** The current ICU library major/minor version as a string without dots, for library name suffixes. * This value will change in the subsequent releases of ICU @@ -131,7 +131,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "58.1" +#define U_ICU_DATA_VERSION "58.2" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/deps/icu-small/source/common/ustrcase.cpp b/deps/icu-small/source/common/ustrcase.cpp index 69c17e43b9..be5c988bd1 100644 --- a/deps/icu-small/source/common/ustrcase.cpp +++ b/deps/icu-small/source/common/ustrcase.cpp @@ -305,6 +305,9 @@ ustrcase_internalToTitle(const UCaseMap *csm, src, &csc, titleLimit, idx, pErrorCode); + if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) { + *pErrorCode=U_ZERO_ERROR; + } if(U_FAILURE(*pErrorCode)) { return destIndex; } diff --git a/deps/icu-small/source/data/in/icudt58l.dat b/deps/icu-small/source/data/in/icudt58l.dat Binary files differindex 458da3e69d..bc36c1313d 100644 --- a/deps/icu-small/source/data/in/icudt58l.dat +++ b/deps/icu-small/source/data/in/icudt58l.dat diff --git a/deps/icu-small/source/i18n/digitlst.cpp b/deps/icu-small/source/i18n/digitlst.cpp index 8bb470c8f0..e3873eb59f 100644 --- a/deps/icu-small/source/i18n/digitlst.cpp +++ b/deps/icu-small/source/i18n/digitlst.cpp @@ -60,8 +60,8 @@ # endif #endif -#if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API -# if U_PLATFORM == U_PF_CYGWIN +#if U_USE_STRTOD_L +# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN # include <locale.h> # else # include <xlocale.h> diff --git a/deps/icu-small/source/i18n/scriptset.cpp b/deps/icu-small/source/i18n/scriptset.cpp index ab7cb1e68e..951fe44080 100644 --- a/deps/icu-small/source/i18n/scriptset.cpp +++ b/deps/icu-small/source/i18n/scriptset.cpp @@ -258,7 +258,7 @@ void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) { while (TRUE) { script_count = uscript_getScriptExtensions( - codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus); + codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus); if (internalStatus == U_BUFFER_OVERFLOW_ERROR) { // Need to allocate more space if (scripts.resize(script_count) == NULL) { diff --git a/deps/icu-small/source/i18n/uspoof.cpp b/deps/icu-small/source/i18n/uspoof.cpp index 3be10862fc..d81b5b2149 100644 --- a/deps/icu-small/source/i18n/uspoof.cpp +++ b/deps/icu-small/source/i18n/uspoof.cpp @@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc, return dest; } - // Check that at least one of the CONFUSABLE flags is turned on. If not, - // return an error. - if ((This->fChecks & USPOOF_CONFUSABLE) == 0) { - *status = U_ILLEGAL_ARGUMENT_ERROR; - return dest; - } - UnicodeString nfdId; gNfdNormalizer->normalize(id, nfdId, *status); |