aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading volume name from incorrect FAT implementations that fill with NULs. Fixes #386

Browse Source
This commit is contained in:
Natalia Portillo
2020-10-31 22:14:20 +00:00
parent e68eef3448
commit 0c20a24bc0
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aaru.Filesystems/FAT/Info.cs
View File

@@ -545,7 +545,8 @@ namespace Aaru.Filesystems
if(fat32Bpb.signature == 0x29) if(fat32Bpb.signature == 0x29)
{ {
XmlFsType.VolumeName = Encoding.ASCII.GetString(fat32Bpb.volume_label); XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type)). sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type)).
AppendLine(); AppendLine();
@@ -869,7 +870,8 @@ namespace Aaru.Filesystems
if(fakeBpb.signature == 0x29 || andosOemCorrect) if(fakeBpb.signature == 0x29 || andosOemCorrect)
{ {
XmlFsType.VolumeName = Encoding.ASCII.GetString(fakeBpb.volume_label); XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fakeBpb.fs_type)).AppendLine(); sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fakeBpb.fs_type)).AppendLine();
} }
} }

32
Aaru.Filesystems/FAT/Super.cs
View File

@@ -195,7 +195,10 @@ namespace Aaru.Filesystems
_useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1; _useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
if(fat32Bpb.signature == 0x29) if(fat32Bpb.signature == 0x29)
XmlFsType.VolumeName = Encoding.ASCII.GetString(fat32Bpb.volume_label); {
XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
}
// Check that jumps to a correct boot code position and has boot signature set. // Check that jumps to a correct boot code position and has boot signature set.
// This will mean that the volume will boot, even if just to say "this is not bootable change disk"...... // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
@@ -407,7 +410,10 @@ namespace Aaru.Filesystems
XmlFsType.Dirty = true; XmlFsType.Dirty = true;
if(fakeBpb.signature == 0x29 || andosOemCorrect) if(fakeBpb.signature == 0x29 || andosOemCorrect)
XmlFsType.VolumeName = Encoding.ASCII.GetString(fakeBpb.volume_label); {
XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
}
} }
// Workaround that PCExchange jumps into "FAT16 "... // Workaround that PCExchange jumps into "FAT16 "...
@@ -477,8 +483,10 @@ namespace Aaru.Filesystems
var rootMs = new MemoryStream(); var rootMs = new MemoryStream();
uint[] rootDirectoryClusters = GetClusters(rootDirectoryCluster); uint[] rootDirectoryClusters = GetClusters(rootDirectoryCluster);
foreach(var buffer in rootDirectoryClusters.Select(cluster => imagePlugin.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster), foreach(byte[] buffer in rootDirectoryClusters.Select(cluster =>
_sectorsPerCluster))) imagePlugin.
ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
_sectorsPerCluster)))
{ {
rootMs.Write(buffer, 0, buffer.Length); rootMs.Write(buffer, 0, buffer.Length);
} }
@@ -572,6 +580,8 @@ namespace Aaru.Filesystems
entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && _namespace == Namespace.Nt entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && _namespace == Namespace.Nt
? volname.ToLower() : volname; ? volname.ToLower() : volname;
XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
if(entry.ctime > 0 && if(entry.ctime > 0 &&
entry.cdate > 0) entry.cdate > 0)
{ {
@@ -639,9 +649,7 @@ namespace Aaru.Filesystems
{ {
HumanDirectoryEntry humanEntry = HumanDirectoryEntry humanEntry =
Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i, Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i,
Marshal. Marshal.SizeOf<HumanDirectoryEntry>());
SizeOf<HumanDirectoryEntry
>());
completeEntry.HumanDirent = humanEntry; completeEntry.HumanDirent = humanEntry;
@@ -822,12 +830,7 @@ namespace Aaru.Filesystems
if(_fat32 || _debug) if(_fat32 || _debug)
{ {
List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = _rootDirectoryCache. List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = _rootDirectoryCache.
Where(t => Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, _cultureInfo)).ToList();
t.Key.
EndsWith(FAT32_EA_TAIL,
true,
_cultureInfo)).
ToList();
foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars) foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
{ {
@@ -854,6 +857,9 @@ namespace Aaru.Filesystems
_mounted = true; _mounted = true;
if(string.IsNullOrWhiteSpace(XmlFsType.VolumeName))
XmlFsType.VolumeName = null;
return Errno.NoError; return Errno.NoError;
} }