Skip to content

Fix XDVDFS bug #88

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
mnadareski merged 2 commits into from
Apr 20, 2026
Merged

Fix XDVDFS bug #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be2fd3
Fix XDVDFS bug
Deterous Apr 20, 2026
4f2dd0a
Move check and seek earlier
Deterous Apr 20, 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
11 changes: 4 additions & 7 deletions SabreTools.Serialization.Readers/XDVDFS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ public static FourPartVersionType ParseFourPartVersionType(Stream data)

var obj = new Dictionary<uint, DirectoryDescriptor>();

// Seek to current descriptor
data.SeekIfPossible(initialOffset + (((long)offset) * Constants.SectorSize), SeekOrigin.Begin);

// Parse current descriptor
var dd = ParseDirectoryDescriptor(data, initialOffset, offset, size);
if (dd is null)
return null;
Expand All @@ -161,13 +165,6 @@ public static FourPartVersionType ParseFourPartVersionType(Stream data)
if (obj.ContainsKey(dr.ExtentOffset))
continue;

// Ensure offset is valid
if ((((long)dr.ExtentOffset) * Constants.SectorSize) + size > data.Length)
return null;

// Seek to child descriptor
data.SeekIfPossible(initialOffset + (((long)dr.ExtentOffset) * Constants.SectorSize), SeekOrigin.Begin);

// Get all descriptors from child
var descriptors = ParseDirectoryDescriptors(data, initialOffset, dr.ExtentOffset, dr.ExtentSize);
if (descriptors is null)
Expand Down