VHDX LogEntry.TryRead() Bug Fix and Improvements#5
Merged
Olof-Lagerkvist merged 1 commit intoMar 1, 2024
Conversation
Author
|
I made some changes back in 2017 in the DiscUtils/DiscUtils repo, and then more recently noticed a bug in this code related to those changes. I originally opened a pull request in DiscUtils/DiscUtils with changes very similar to these, but that repo is basically abandoned, so I ported the changes for this repo. |
glenebob
commented
Feb 29, 2024
| } | ||
| headerBuffer.CopyTo(logEntryBuffer); | ||
|
|
||
| var sig = EndianUtilities.ToUInt32LittleEndian(sectorBuffer, 0); |
glenebob
commented
Feb 29, 2024
| var header = new LogEntryHeader(); | ||
| header.ReadFrom(sectorBuffer.AsSpan(0, LogSectorSize)); | ||
|
|
||
| if (!header.IsValid || header.EntryLength > logStream.Length) |
Author
There was a problem hiding this comment.
This data availability check would be broken when working within a stream starting at an offset > 0. ReadMaximum() below does the availability check correctly.
Member
|
Thanks a lot for the contribution! I'll just take a look at the changes before I merge the PR. But it looks like a good improvement. |
Change LogEntryHeader member variables to properties. Read header into 64-byte, stackalloc'd buffer, then read remaining bytes directly into logEntryBuffer. Remove buggy byte availability calculation. Remove redundant signature check (which is done in LogEntryHeader.IsValid). Use ReadMaximum instread of ReadExactly to guarantee no exception will be thrown, and use its return value to verify correct byte count.
glenebob
force-pushed
the
vhdx-logentry-tryread-improvements
branch
from
5edede9 to
b0ecacc
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Change LogEntryHeader member variables to properties.
Read header into 64-byte, stackalloc'd buffer, then read remaining bytes directly into logEntryBuffer.
Remove buggy byte availability calculation.
Remove redundant signature check (which is done in LogEntryHeader.IsValid).
Use ReadMaximum() instread of ReadExactly() to guarantee no exception will be thrown, and use its return value to verify correct byte count.