Skip to content

Fix git ls-files parsing across partial stream reads #168

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
David Federman (dfederm) merged 2 commits into from
Aug 6, 2026
+5 −13
Merged

Fix git ls-files parsing across partial stream reads #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5829a04
Fix git ls-files partial read parsing
Evangelink Aug 6, 2026
639e256
Narrow git output parsing fix
Evangelink Aug 6, 2026
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
Binary file modified src/Common.Tests/SourceControl/GitFileHashProviderTest.cs
View file
Open in desktop
Binary file not shown.
18 changes: 5 additions & 13 deletions src/Common/SourceControl/GitFileHashProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,26 +343,18 @@ private void PopulateAsync(TextReader reader)

readCnt += overflowLength;
int startIdx = 0, eolIdx;
while (startIdx < readCnt && (eolIdx = Array.IndexOf(buffer, '\0', startIdx)) != -1)
while (startIdx < readCnt && (eolIdx = Array.IndexOf(buffer, '\0', startIdx, readCnt - startIdx)) != -1)
{
int lineLength = eolIdx - startIdx;
if (overflowLength > 0)
{
overflowLength = 0;
startIdx = 0;
}
_lines.Add(new StringBuilder(lineLength).Append(buffer, startIdx, lineLength));
startIdx = eolIdx + 1;
}
if (startIdx < readCnt)
overflowLength = readCnt - startIdx;
if (overflowLength == buffer.Length)
{
if (overflowLength > 0) // we already have some overflow left, but the line could not fit the buffer
{
throw new InvalidDataException($"Internal: git ls-files output line length {readCnt - startIdx} exceeds {nameof(buffer)} size {buffer.Length}. Increase the latter.");
}
overflowLength = readCnt - startIdx;
Array.Copy(buffer, startIdx, buffer, 0, overflowLength);
throw new InvalidDataException($"Internal: git ls-files output line length {overflowLength} exceeds {nameof(buffer)} size {buffer.Length}. Increase the latter.");
}
Array.Copy(buffer, startIdx, buffer, 0, overflowLength);
}
}

Expand Down