Skip to content

Move more sprintf usages to snprintf #92674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Move more sprintf usages to snprintf #92674

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9656568
Move more sprintf usages to snprintf
jkoritzinsky Sep 26, 2023
d0dff7f
Add casts and some asserts to validate expected behavior
jkoritzinsky Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/native/libs/System.Globalization.Native/pal_icushim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ static int FindICULibs(char* symbolName, char* symbolVersion)
#define MinSubICUVersion 1
#define MaxSubICUVersion 5

#define VERSIONED_LIB_NAME_LEN 64

// Get filename of an ICU library with the requested version in the name
// There are three possible cases of the version components values:
// 1. Only majorVer is not equal to -1 => result is baseFileName.majorver
Expand All @@ -245,23 +247,25 @@ static void GetVersionedLibFileName(const char* baseFileName, int majorVer, int
{
assert(majorVer != -1);

int nameLen = sprintf(result, "%s.%s%d", baseFileName, versionPrefix, majorVer);
int nameLen = snprintf(result, VERSIONED_LIB_NAME_LEN, "%s.%s%d", baseFileName, versionPrefix, majorVer);

if (minorVer != -1)
{
nameLen += sprintf(result + nameLen, ".%d", minorVer);
assert(nameLen <= VERSIONED_LIB_NAME_LEN);
nameLen += snprintf(result + nameLen, (size_t)(VERSIONED_LIB_NAME_LEN - nameLen), ".%d", minorVer);
if (subVer != -1)
{
sprintf(result + nameLen, ".%d", subVer);
assert(nameLen <= VERSIONED_LIB_NAME_LEN);
snprintf(result + nameLen, (size_t)(VERSIONED_LIB_NAME_LEN - nameLen), ".%d", subVer);
}
}
}

// Try to open the necessary ICU libraries
static int OpenICULibraries(int majorVer, int minorVer, int subVer, const char* versionPrefix, char* symbolName, char* symbolVersion)
{
char libicuucName[64];
char libicui18nName[64];
char libicuucName[VERSIONED_LIB_NAME_LEN];
char libicui18nName[VERSIONED_LIB_NAME_LEN];

c_static_assert_msg(sizeof("libicuuc.so") + MaxICUVersionStringLength <= sizeof(libicuucName), "The libicuucName is too small");
GetVersionedLibFileName("libicuuc.so", majorVer, minorVer, subVer, versionPrefix, libicuucName);
Expand Down Expand Up @@ -417,7 +421,7 @@ static void InitializeUColClonePointers(char* symbolVersion)
ucol_safeClone_ptr = (ucol_safeClone_func)GetProcAddress((HMODULE)libicui18n, symbolName);
#else
char symbolName[SYMBOL_NAME_SIZE];
sprintf(symbolName, "ucol_safeClone%s", symbolVersion);
snprintf(symbolName, SYMBOL_NAME_SIZE, "ucol_safeClone%s", symbolVersion);
ucol_safeClone_ptr = (ucol_safeClone_func)dlsym(libicui18n, symbolName);
#endif // defined(TARGET_WINDOWS)

Expand Down Expand Up @@ -446,7 +450,7 @@ static void InitializeVariableMaxAndTopPointers(char* symbolVersion)
ucol_setVariableTop_ptr = (ucol_setVariableTop_func)GetProcAddress((HMODULE)libicui18n, symbolName);
#else
char symbolName[SYMBOL_NAME_SIZE];
sprintf(symbolName, "ucol_setVariableTop%s", symbolVersion);
snprintf(symbolName, SYMBOL_NAME_SIZE, "ucol_setVariableTop%s", symbolVersion);
ucol_setVariableTop_ptr = (ucol_setVariableTop_func)dlsym(libicui18n, symbolName);
#endif // defined(TARGET_OSX) || defined(TARGET_ANDROID)

Expand Down Expand Up @@ -538,7 +542,7 @@ void GlobalizationNative_InitICUFunctions(void* icuuc, void* icuin, const char*
#if defined(TARGET_WINDOWS)
sprintf_s(symbolSuffix, SYMBOL_CUSTOM_SUFFIX_SIZE, "_%s", suffix);
#else
sprintf(symbolSuffix, "_%s", suffix);
snprintf(symbolSuffix, SYMBOL_CUSTOM_SUFFIX_SIZE, "_%s", suffix);
#endif
}

Expand Down