organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21035 Replace backward compatibility ulocimp_getScript() overload.

Browse source 
By always calling the dynamic memory allocation implementation directly
instead, the fixed memory buffer boundary gets pushed one step further
towards the edges.
This commit is contained in:
Fredrik Roubert 2020-08-20 23:57:16 +02:00 • committed by Fredrik Roubert
parent 3b188e46a4
commit db3278a71e
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/common/loclikely.cpp
View file

@ -485,8 +485,7 @@ parseTagString(
++position;
}
subtagLength = ulocimp_getScript(position, script, *scriptLength, &position);
u_terminateChars(script, *scriptLength, subtagLength, err);
subtagLength = ulocimp_getScript(position, &position, *err).extract(script, *scriptLength, *err);
if(U_FAILURE(*err)) {
goto error;

31
icu4c/source/common/uloc.cpp
View file

@ -1181,7 +1181,7 @@ ulocimp_getLanguage(const char *localeID,
return result;
}
static CharString
CharString U_EXPORT2
ulocimp_getScript(const char *localeID,
const char **pEnd,
UErrorCode &status) {
@ -1215,14 +1215,6 @@ ulocimp_getScript(const char *localeID,
return result;
}
U_CFUNC int32_t
ulocimp_getScript(const char *localeID,
char *script, int32_t scriptCapacity,
const char **pEnd) {
ErrorCode status;
return ulocimp_getScript(localeID, pEnd, status).extract(script, scriptCapacity, status);
}
static CharString
ulocimp_getCountry(const char *localeID,
const char **pEnd,
@ -1456,7 +1448,10 @@ uloc_openKeywords(const char* localeID,
if(_isIDSeparator(*tmpLocaleID)) {
const char *scriptID;
/* Skip the script if available */
ulocimp_getScript(tmpLocaleID+1, NULL, 0, &scriptID);
ulocimp_getScript(tmpLocaleID+1, &scriptID, *status);
if (U_FAILURE(*status)) {
return 0;
}
if(scriptID != tmpLocaleID+1) {
/* Found optional script */
tmpLocaleID = scriptID;
@ -1729,8 +1724,6 @@ uloc_getScript(const char* localeID,
int32_t scriptCapacity,
UErrorCode* err)
{
int32_t i=0;
if(err==NULL || U_FAILURE(*err)) {
return 0;
}
@ -1746,9 +1739,9 @@ uloc_getScript(const char* localeID,
}
if(_isIDSeparator(*localeID)) {
i=ulocimp_getScript(localeID+1, script, scriptCapacity, NULL);
return ulocimp_getScript(localeID+1, NULL, *err).extract(script, scriptCapacity, *err);
}
return u_terminateChars(script, scriptCapacity, i, err);
return u_terminateChars(script, scriptCapacity, 0, err);
}
U_CAPI int32_t U_EXPORT2
@ -1776,7 +1769,10 @@ uloc_getCountry(const char* localeID,
if(_isIDSeparator(*localeID)) {
const char *scriptID;
/* Skip the script if available */
ulocimp_getScript(localeID+1, NULL, 0, &scriptID);
ulocimp_getScript(localeID+1, &scriptID, *err);
if (U_FAILURE(*err)) {
return 0;
}
if(scriptID != localeID+1) {
/* Found optional script */
localeID = scriptID;
@ -1820,7 +1816,10 @@ uloc_getVariant(const char* localeID,
if(_isIDSeparator(*tmpLocaleID)) {
const char *scriptID;
/* Skip the script if available */
ulocimp_getScript(tmpLocaleID+1, NULL, 0, &scriptID);
ulocimp_getScript(tmpLocaleID+1, &scriptID, *err);
if (U_FAILURE(*err)) {
return 0;
}
if(scriptID != tmpLocaleID+1) {
/* Found optional script */
tmpLocaleID = scriptID;

6
icu4c/source/common/ulocimp.h
View file

@ -54,10 +54,10 @@ ulocimp_getLanguage(const char *localeID,
const char **pEnd,
UErrorCode &status);
U_CFUNC int32_t
icu::CharString U_EXPORT2
ulocimp_getScript(const char *localeID,
char *script, int32_t scriptCapacity,
const char **pEnd);
const char **pEnd,
UErrorCode &status);
U_CFUNC int32_t
ulocimp_getCountry(const char *localeID,