Skip to content

Move app local ICU string length validation to native shim #36735

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
safern merged 2 commits into from
May 22, 2020
Merged

Move app local ICU string length validation to native shim #36735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78cb9ef
Move app local string length validation to native shim
safern May 20, 2020
1d16730
Fix build
safern May 20, 2020
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
11 changes: 0 additions & 11 deletions src/coreclr/src/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,13 @@ private static void LoadAppLocalIcu(string icuSuffixAndVersion, bool suffixWithS
if (indexOfSeparator >= 0)
{
icuSuffix = icuSuffixAndVersion.AsSpan().Slice(0, indexOfSeparator);

if (icuSuffix.Length > 35)
{
Environment.FailFast($"The resolved \"{icuSuffix.ToString()}\" suffix from System.Globalization.AppLocalIcu switch has to be < 20 chars long.");
}

version = icuSuffixAndVersion.AsSpan().Slice(icuSuffix.Length + 1);
}
else
{
version = icuSuffixAndVersion;
}

if (version.Length > 33)
{
Environment.FailFast($"The resolved version \"{version.ToString()}\" from System.Globalization.AppLocalIcu switch has to be < 33 chars long.");
}

if (suffixWithSeparator)
{
icuSuffix = string.Concat(icuSuffix, ".");
Expand Down
13 changes: 13 additions & 0 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,23 @@ void GlobalizationNative_InitICUFunctions(void* icuuc, void* icuin, const char*
char symbolVersion[MaxICUVersionStringWithSuffixLength + 1]="";
char symbolSuffix[SYMBOL_CUSTOM_SUFFIX_SIZE]="";

if (strlen(version) > (size_t)MaxICUVersionStringLength)
{
fprintf(stderr, "The resolved version \"%s\" from System.Globalization.AppLocalIcu switch has to be < %zu chars long.\n", version, (size_t)MaxICUVersionStringLength);
abort();
}

sscanf(version, "%d.%d.%d", &major, &minor, &build);

if (suffix != NULL)
{
size_t suffixAllowedSize = SYMBOL_CUSTOM_SUFFIX_SIZE - 2; // SYMBOL_CUSTOM_SUFFIX_SIZE considers `_` and `\0`.
if (strlen(suffix) > suffixAllowedSize)
{
fprintf(stderr, "The resolved suffix \"%s\" from System.Globalization.AppLocalIcu switch has to be < %zu chars long.\n", suffix, suffixAllowedSize);
abort();
}

assert(strlen(suffix) + 1 <= SYMBOL_CUSTOM_SUFFIX_SIZE);

#if defined(TARGET_WINDOWS)
Expand Down