-
Notifications
You must be signed in to change notification settings - Fork 137
Fix interpretation of ref-index record block position #1678
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.
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
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
src/Microsoft.Build.Tasks.Git/GitDataReader/GitRefTableReader.Diagnostics.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| #if DEBUG | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.IO; | ||
|
|
||
| namespace Microsoft.Build.Tasks.Git; | ||
|
|
||
| // Utilities for diagnosing reader issues. | ||
|
|
||
| internal sealed partial class GitRefTableReader | ||
| { | ||
| public record Block( | ||
| char Type, | ||
| long Position, | ||
| int UnalignedSize, | ||
| List<RefRecord> RefRecords, | ||
| List<RefIndexRecord> IndexRecords, | ||
| List<int> RestartOffsets) | ||
| { | ||
| public override string ToString() | ||
| => $"Type: '{Type}', Position: {Position}, UnalignedSize: {UnalignedSize}, Records: {RefRecords.Count + IndexRecords.Count}, RestartOffsets: {RestartOffsets.Count}"; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns all ref-blocks and ref-index-blocks. | ||
| /// </summary> | ||
| public List<Block> GetBlocks() | ||
| { | ||
| var footer = ReadHeaderAndFooter(); | ||
|
|
||
| var blocks = new List<Block>(); | ||
|
|
||
| Position = footer.Header.Size; | ||
| var blockStartPosition = 0L; | ||
|
|
||
| while (Position < footer.Position) | ||
| { | ||
| var blockType = ReadByte(); | ||
| var unalignedSize = ReadUInt24BE(); | ||
|
|
||
| var refRecords = new List<RefRecord>(); | ||
| var indexRecords = new List<RefIndexRecord>(); | ||
| var restartOffsets = new List<int>(); | ||
|
|
||
| if (blockType is not (BlockTypeRef or BlockTypeIndex)) | ||
| { | ||
| break; | ||
| } | ||
|
|
||
| var firstRecordPosition = Position; | ||
|
|
||
| Position = blockStartPosition + unalignedSize - sizeof(ushort); | ||
| var restartCount = ReadUInt16BE(); | ||
| Position = firstRecordPosition; | ||
|
|
||
| var endOfRecords = blockStartPosition + unalignedSize - restartCount * SizeOfUInt24 - sizeof(ushort); | ||
| while (Position < endOfRecords) | ||
| { | ||
| if (blockType == BlockTypeRef) | ||
| { | ||
| refRecords.Add(ReadRefRecord(footer.Header, priorName: null)); | ||
| } | ||
| else | ||
| { | ||
| indexRecords.Add(ReadRefIndexRecord(priorName: null)); | ||
| } | ||
| } | ||
|
|
||
| for (var i = 0; i < restartCount; i++) | ||
| { | ||
| restartOffsets.Add(ReadUInt24BE()); | ||
| } | ||
|
|
||
| // restart_count | ||
| _ = ReadUInt16BE(); | ||
|
|
||
| blocks.Add(new Block((char)blockType, blockStartPosition, unalignedSize, refRecords, indexRecords, restartOffsets)); | ||
|
|
||
| // If the file is unaligned the next block starts at the end of the current block, | ||
| // otherwise the current block is padded to block size and the next block starts after the padding. | ||
| blockStartPosition = footer.Header.BlockSize > 0 ? blockStartPosition + footer.Header.BlockSize : Position; | ||
|
|
||
| while (Position < blockStartPosition) | ||
| { | ||
| var padding = ReadByte(); | ||
| if (padding != 0) | ||
| { | ||
| throw new InvalidDataException($"Unexpected non-zero padding byte: 0x{padding:X2}."); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return blocks; | ||
| } | ||
| } | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.