actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-13 10:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

throw argument exception to guard against case where pos1 is greater than pos2

Browse Source
This commit is contained in:
Ben Wells
2023-07-26 14:44:37 +00:00
parent 62d0a70002
commit 71600dec6e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Runner.Worker/FileCommandManager.cs
View File

@@ -329,11 +329,11 @@ namespace GitHub.Runner.Worker
var isHeredoc = heredocIndex >= 0 && var isHeredoc = heredocIndex >= 0 &&
( (
equalsIndex < 0 || equalsIndex < 0 ||
heredocIndex < equalsIndex ||
( (
heredocIndex > equalsIndex && heredocIndex > equalsIndex &&
OnlyContainsWhiteSpaceBetweenPositions(line, equalsIndex, heredocIndex) OnlyContainsWhiteSpaceBetweenPositions(line, equalsIndex, heredocIndex)
) ) || heredocIndex < equalsIndex
); );
if (isHeredoc) if (isHeredoc)
@@ -401,15 +401,13 @@ namespace GitHub.Runner.Worker
// Check if the provided positions are valid // Check if the provided positions are valid
if (pos1 < 0 || pos2 < 0 || pos1 >= str.Length || pos2 >= str.Length) if (pos1 < 0 || pos2 < 0 || pos1 >= str.Length || pos2 >= str.Length)
{ {
throw new ArgumentOutOfRangeException("Whitespace check: Positions should be within the string length."); throw new ArgumentOutOfRangeException("OnlyContainsWhiteSpaceBetweenPositions: Positions should be within the string length.");
} }
// Ensure pos1 is always the smaller position // Ensure pos1 is always the smaller position
if (pos2 < pos1) if (pos2 < pos1)
{ {
int temp = pos2; throw new ArgumentException("OnlyContainsWhiteSpaceBetweenPositions: pos1 must be less than or equal to pos2.")
pos2 = pos1;
pos1 = temp;
} }
for (int i = pos1 + 1; i < pos2; i++) for (int i = pos1 + 1; i < pos2; i++)