Skip to content

Add an exception handler around ReadCluster in the event that it fail… #31

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

Open
aerosoul94 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add an exception handler around ReadCluster in the event that it fail… #31

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
174de19
Add an exception handler around ReadCluster in the event that it fail…
aerosoul94 Aug 1, 2023
c299779
Add exception handlers on all uses of ReadCluster
aerosoul94 Aug 12, 2023
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
15 changes: 14 additions & 1 deletion FATX/Analyzers/MetadataAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,20 @@ private void RecoverMetadata(CancellationToken cancellationToken, IProgress<int>
var maxClusters = _length / _interval;
for (uint cluster = 1; cluster < maxClusters; cluster++)
{
var data = _volume.ReadCluster(cluster);
byte[] data;

try
{
data = _volume.ReadCluster(cluster);
}
catch (IOException exception)
{
// Failed to read data
Console.WriteLine(exception.Message);
Console.WriteLine($"Failed to read cluster {cluster}, skipping...");
continue;
}

var clusterOffset = (cluster - 1) * _interval;
for (int i = 0; i < 256; i++)
{
Expand Down
16 changes: 15 additions & 1 deletion FATX/FileSystem/Volume.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,20 @@ private List<DirectoryEntry> ReadDirectoryStream(uint cluster)
{
List<DirectoryEntry> stream = new List<DirectoryEntry>();

byte[] data = ReadCluster(cluster);
byte[] data;

try
{
data = ReadCluster(cluster);
}
catch (IOException exception)
{
// Failed to read data, return an empty list
Console.WriteLine(exception.Message);
Console.WriteLine($"Due to exception, returning empty directory stream for cluster {cluster}");
return stream;
}

long clusterOffset = ClusterToPhysicalOffset(cluster);

for (int i = 0; i < 256; i++)
Expand Down Expand Up @@ -364,6 +377,7 @@ public void SeekToCluster(uint cluster)
/// Reads a cluster and returns the data.
/// </summary>
/// <param name="cluster"></param>
/// <exception cref="System.IO.IOException">May be thrown on read errors.</exception>
/// <returns></returns>
public byte[] ReadCluster(uint cluster)
{
Expand Down
15 changes: 14 additions & 1 deletion FATXTools/Controls/FileExplorer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,20 @@ private void WriteFile(string path, DirectoryEntry dirent, List<uint> chainMap)

foreach (uint cluster in chainMap)
{
byte[] clusterData = this.volume.ReadCluster(cluster);
byte[] clusterData;

try
{
clusterData = this.volume.ReadCluster(cluster);
}
catch (IOException exception)
{
// Failed to read cluster, write null bytes instead.
var position = outFile.Position;
Console.WriteLine(exception.Message);
Console.WriteLine($"Due to exception, writing null cluster at {position} to file: {path}");
clusterData = new byte[volume.BytesPerCluster];
}

var writeSize = Math.Min(bytesLeft, this.volume.BytesPerCluster);
outFile.Write(clusterData, 0, (int)writeSize);
Expand Down
15 changes: 14 additions & 1 deletion FATXTools/Controls/RecoveryResults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,20 @@ private void WriteFile(string path, DatabaseFile databaseFile)

foreach (uint cluster in databaseFile.ClusterChain)
{
byte[] clusterData = this.volume.ReadCluster(cluster);
byte[] clusterData;

try
{
clusterData = this.volume.ReadCluster(cluster);
}
catch (IOException exception)
{
// Failed to read cluster, write null bytes instead.
var position = outFile.Position;
Console.WriteLine(exception.Message);
Console.WriteLine($"Due to exception, writing null cluster at {position} to file: {path}");
clusterData = new byte[volume.BytesPerCluster];
}

var writeSize = Math.Min(bytesLeft, this.volume.BytesPerCluster);
outFile.Write(clusterData, 0, (int)writeSize);
Expand Down