Skip to content

Fix string comparison with ordinal casing with Surrogates #55771

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
tarekgh merged 2 commits into from
Jul 16, 2021
Merged

Fix string comparison with ordinal casing with Surrogates #55771

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e29bb6
Fix string comparison with ordinal casing with Surrogates
tarekgh Jul 15, 2021
650afa2
Address the feedback
tarekgh Jul 15, 2021
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
Prev Previous commit
Address the feedback
  • Loading branch information
@tarekgh
tarekgh committed Jul 15, 2021
commit 650afa282458ec0c468c3d78f58c4c6e8dbf5b80
11 changes: 7 additions & 4 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,9 @@ internal static int CompareStringIgnoreCase(ref char strA, int lengthA, ref char
{
char a = charA;
char b = charB;
char lowSurrogateA = '\0';

if (!char.IsHighSurrogate(a) || index >= lengthA - 1 || !char.IsLowSurrogate(Unsafe.Add(ref charA, 1)))
if (!char.IsHighSurrogate(a) || index >= lengthA - 1 || !char.IsLowSurrogate(lowSurrogateA = Unsafe.Add(ref charA, 1)))
{
if (!char.IsHighSurrogate(b) || index >= lengthB - 1 || !char.IsLowSurrogate(Unsafe.Add(ref charB, 1)))
{
Expand Down Expand Up @@ -245,7 +246,9 @@ internal static int CompareStringIgnoreCase(ref char strA, int lengthA, ref char
// A is Surrogate
//

if (!char.IsHighSurrogate(b) || index >= lengthB - 1 || !char.IsLowSurrogate(Unsafe.Add(ref charB, 1)))
char lowSurrogateB = '\0';

if (!char.IsHighSurrogate(b) || index >= lengthB - 1 || !char.IsLowSurrogate(lowSurrogateB = Unsafe.Add(ref charB, 1)))
{
//
// charB is not surrogate and charA is surrogate
Expand All @@ -258,8 +261,8 @@ internal static int CompareStringIgnoreCase(ref char strA, int lengthA, ref char
// charA and charB are surrogates
//

char lowSurrogateA = Unsafe.Add(ref charA, 1);
char lowSurrogateB = Unsafe.Add(ref charB, 1);
Debug.Assert(lowSurrogateA != '\0');
Debug.Assert(lowSurrogateB != '\0');

if (a == b && lowSurrogateA == lowSurrogateB)
{
Expand Down