Skip to content

Fix length check for Regex BOL FindFirstChar optimization #55574

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 1 commit into from
Jul 13, 2021
Merged

Fix length check for Regex BOL FindFirstChar optimization #55574

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
12 changes: 7 additions & 5 deletions ...raries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,19 +1240,21 @@ protected void GenerateFindFirstChar()
{
Stloc(newlinePos);

// if (newlinePos == -1)
// if (newlinePos == -1 || newlinePos + 1 > runtextend)
// {
// runtextpos = runtextend;
// return false;
// }
Label foundNextLine = DefineLabel();
Ldloc(newlinePos);
Ldc(-1);
Bne(foundNextLine);
BrFar(returnFalse);
Beq(returnFalse);
Ldloc(newlinePos);
Ldc(1);
Add();
Ldloc(_runtextendLocal);
Bgt(returnFalse);

// runtextpos = newlinePos + 1;
MarkLabel(foundNextLine);
Ldloc(newlinePos);
Ldc(1);
Add();
Expand Down
4 changes: 2 additions & 2 deletions ...ies/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ protected override bool FindFirstChar()
if (runtextpos > runtextbeg && runtext![runtextpos - 1] != '\n')
{
int newline = runtext.IndexOf('\n', runtextpos);
if (newline == -1)
if (newline == -1 || newline + 1 > runtextend)
{
runtextpos = runtextend;
return false;
Expand Down Expand Up @@ -457,7 +457,7 @@ protected override bool FindFirstChar()
if (!_code.LeadingCharClasses[0].CaseInsensitive)
{
// singleton, left-to-right, case-sensitive
int i = runtext.AsSpan(runtextpos, runtextend - runtextpos).IndexOf(ch);
int i = span.IndexOf(ch);
if (i >= 0)
{
runtextpos += i;
Expand Down
13 changes: 8 additions & 5 deletions src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ public static IEnumerable<object[]> Match_Basic_TestData()
// Using beginning/end of string chars \A, \Z: Actual - "\\Aaaa\\w+zzz\\Z"
yield return new object[] { @"\Aaaa\w+zzz\Z", "aaaasdfajsdlfjzzza", RegexOptions.None, 0, 18, false, string.Empty };

// Anchors and multiline
yield return new object[] { @"^A$", "ABC\n", RegexOptions.Multiline, 0, 2, false, string.Empty };

// Using beginning/end of string chars \A, \Z: Actual - "\\Aaaa\\w+zzz\\Z"
yield return new object[] { @"\A(line2\n)line3\Z", "line2\nline3\n", RegexOptions.Multiline, 0, 12, true, "line2\nline3" };

Expand Down Expand Up @@ -813,7 +816,7 @@ public static IEnumerable<object[]> Match_Advanced_TestData()
}
};

// Mutliline
// Multiline
yield return new object[]
{
"(line2$\n)line3", "line1\nline2\nline3\n\nline4", RegexOptions.Multiline, 0, 24,
Expand All @@ -824,7 +827,7 @@ public static IEnumerable<object[]> Match_Advanced_TestData()
}
};

// Mutliline
// Multiline
yield return new object[]
{
"(line2\n^)line3", "line1\nline2\nline3\n\nline4", RegexOptions.Multiline, 0, 24,
Expand All @@ -835,7 +838,7 @@ public static IEnumerable<object[]> Match_Advanced_TestData()
}
};

// Mutliline
// Multiline
yield return new object[]
{
"(line3\n$\n)line4", "line1\nline2\nline3\n\nline4", RegexOptions.Multiline, 0, 24,
Expand All @@ -846,7 +849,7 @@ public static IEnumerable<object[]> Match_Advanced_TestData()
}
};

// Mutliline
// Multiline
yield return new object[]
{
"(line3\n^\n)line4", "line1\nline2\nline3\n\nline4", RegexOptions.Multiline, 0, 24,
Expand All @@ -857,7 +860,7 @@ public static IEnumerable<object[]> Match_Advanced_TestData()
}
};

// Mutliline
// Multiline
yield return new object[]
{
"(line2$\n^)line3", "line1\nline2\nline3\n\nline4", RegexOptions.Multiline, 0, 24,
Expand Down