Skip to content

StringSegment behavior #55501

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
eerhardt merged 6 commits into from
Jul 15, 2021
Merged

StringSegment behavior #55501

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78b34dd
Add tests for old issue
hrrrrustic Jul 12, 2021
0cb330e
Add test for new issue
hrrrrustic Jul 12, 2021
78f7f5b
fix behavior for old issue
hrrrrustic Jul 12, 2021
0f43edb
fix behavior for new issue
hrrrrustic Jul 12, 2021
1fd3d1b
Update IndexOf checks for consistency
hrrrrustic Jul 12, 2021
b96959f
Apply suggestions from code review
hrrrrustic Jul 12, 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
Next Next commit
Update IndexOf checks for consistency
  • Loading branch information
@hrrrrustic
hrrrrustic committed Jul 12, 2021
commit 1fd3d1ba5d24327c15dffdc41eb5e2580005600d
5 changes: 2 additions & 3 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 @@ -453,16 +453,15 @@ public StringSegment Subsegment(int offset, int length)
public int IndexOf(char c, int start, int count)
{
int index = -1;
int offset = Offset + start;

if (HasValue)
{
if (start < 0 || (uint)offset > (uint)Buffer.Length)
if (start < 0 || start > Length)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.start);
}

if (count < 0)
if (count < 0 || start + count > Length)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
}
Expand Down