Skip to content

Replaced string.Compare with Buffer.EndsWith to fix #39140 #39853

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

Closed
violetshine wants to merge 1 commit into from
Closed

Replaced string.Compare with Buffer.EndsWith to fix #39140 #39853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 12 additions & 15 deletions src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,14 @@ public bool StartsWith(string text, StringComparison comparisonType)
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
}

bool result = false;
int textLength = text.Length;

if (HasValue && Length >= textLength)
if (HasValue)
{
result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
return this.AsSpan().StartsWith(text.AsSpan(), comparisonType);
}
else
{
return false;
}

return result;
}

/// <summary>
Expand All @@ -338,16 +337,14 @@ public bool EndsWith(string text, StringComparison comparisonType)
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
}

bool result = false;
int textLength = text.Length;
int comparisonLength = Offset + Length - textLength;

if (HasValue && comparisonLength > 0)
if (HasValue)
{
result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
return this.AsSpan().EndsWith(text.AsSpan(), comparisonType);
}
else
{
return false;
}

return result;
}

/// <summary>
Expand Down
39 changes: 39 additions & 0 deletions src/libraries/Microsoft.Extensions.Primitives/tests/StringSegmentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,19 @@ public void StringSegment_EndsWith_Valid(string candidate, StringComparison comp
Assert.Equal(expectedResult, result);
}

[Fact]
public void StringSegment_EndsWith_Slash()
{
// Arrange
var segment = new StringSegment("/");

// Act
var result = segment.EndsWith("/", StringComparison.Ordinal);

// Assert
Assert.True(result);
}

[Fact]
public void StringSegment_EndsWith_Invalid()
{
Expand Down Expand Up @@ -586,6 +599,32 @@ public void StringSegment_Equals_StringSegment_Valid(StringSegment candidate, St
Assert.Equal(expectedResult, result);
}

[Fact]
public void StringSegment_Equals_InvariantCultureIgnoreCase()
{
// Arrange
var segment = new StringSegment("xaex", 1, 2);

// Act
var result = segment.Equals("\u00C6", StringComparison.InvariantCultureIgnoreCase);

// Assert
Assert.True(result);
}

[Fact]
public void StringSegment_Equals_InvariantCultureIgnoreCase_StringSegment()
{
// Arrange
var segment = new StringSegment("xaex", 1, 2);

// Act
var result = segment.Equals(new StringSegment("\u00C6"), StringComparison.InvariantCultureIgnoreCase);

// Assert
Assert.True(result);
}

[Fact]
public void StringSegment_EqualsStringSegment_Invalid()
{
Expand Down