organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-21160 Fix the length return by preflight

Browse source 
See #1178
This commit is contained in:
Frank Tang 2020-07-20 22:35:31 +00:00 • committed by Frank Yung-Fong Tang
parent 003b431540
commit 0d4b1c1cb9
3 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4c/source/common/locdispnames.cpp
View file

@ -406,17 +406,23 @@ uloc_getDisplayScript(const char* locale,
UChar *dest, int32_t destCapacity,
UErrorCode *pErrorCode)
{
UErrorCode err = U_ZERO_ERROR;
int32_t res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity,
UErrorCode err = U_ZERO_ERROR;
int32_t res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity,
uloc_getScript, _kScriptsStandAlone, &err);
if ( err == U_USING_DEFAULT_WARNING ) {
if (destCapacity == 0 && err == U_BUFFER_OVERFLOW_ERROR) {
// For preflight, return the max of the value and the fallback.
int32_t fallback_res = _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity,
uloc_getScript, _kScripts, pErrorCode);
return (fallback_res > res) ? fallback_res : res;
}
if ( err == U_USING_DEFAULT_WARNING ) {
return _getDisplayNameForComponent(locale, displayLocale, dest, destCapacity,
uloc_getScript, _kScripts, pErrorCode);
} else {
*pErrorCode = err;
return res;
}
uloc_getScript, _kScripts, pErrorCode);
} else {
*pErrorCode = err;
return res;
}
}
static int32_t

21
icu4c/source/test/cintltst/cloctst.c
View file

@ -217,6 +217,7 @@ void addLocaleTest(TestNode** root)
TESTCASE(TestPrefixes);
TESTCASE(TestSimpleResourceInfo);
TESTCASE(TestDisplayNames);
TESTCASE(TestGetDisplayScriptPreFlighting21160);
TESTCASE(TestGetAvailableLocales);
TESTCASE(TestGetAvailableLocalesByType);
TESTCASE(TestDataDirectory);
@ -808,6 +809,26 @@ static void TestDisplayNames()
}
}
/**
* ICU-21160 test the pre-flighting call to uloc_getDisplayScript returns the actual length needed
* for the result buffer.
*/
static void TestGetDisplayScriptPreFlighting21160()
{
const char* locale = "und-Latn";
const char* inlocale = "de";
UErrorCode ec = U_ZERO_ERROR;
UChar* result = NULL;
int32_t length = uloc_getDisplayScript(locale, inlocale, NULL, 0, &ec) + 1;
ec = U_ZERO_ERROR;
result=(UChar*)malloc(sizeof(UChar) * length);
length = uloc_getDisplayScript(locale, inlocale, result, length, &ec);
if (U_FAILURE(ec)) {
log_err("uloc_getDisplayScript length %d returned error %s", length, u_errorName(ec));
}
free(result);
}
/* test for uloc_getAvialable() and uloc_countAvilable()*/
static void TestGetAvailableLocales()

2
icu4c/source/test/cintltst/cloctst.h
View file

@ -33,6 +33,8 @@ static void TestSimpleResourceInfo(void);
* Use Locale to access Resource file display names and compare against expected values
**/
static void TestDisplayNames(void);
static void TestGetDisplayScriptPreFlighting21160(void);
/**
* Test getAvailableLocales
**/