aaru-dps/Aaru-aaru-dps
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-09 02:06:41 +00:00
Code Issues 657 Packages Projects Releases 19 Wiki Activity

[ISO9660] Do not stop processing a directory when there is 1 or more sectors of data left to process,

Browse Source 
directory entries do not span several sectors so there can be padding at the end of a sector.
Fixes #572
This commit is contained in:
Natalia Portillo
2021-04-07 21:54:33 +01:00
parent 8a0064e870
commit 0fa75489ce
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Aaru.Filesystems/ISO9660/Dir.cs
View File

@@ -171,7 +171,17 @@ namespace Aaru.Filesystems
Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(data, entryOff, _cdiDirectoryRecordSize);
if(record.length == 0)
{
// Skip to next sector
if(data.Length - entryOff >= 2048)
{
entryOff = ((data.Length % 2048) + 1) * 2048;
continue;
}
break;
}
// Special entries for current and parent directories, skip them
if(record.name_len == 1)
@@ -240,7 +250,17 @@ namespace Aaru.Filesystems
_highSierraDirectoryRecordSize);
if(record.length == 0)
{
// Skip to next sector
if(data.Length - entryOff >= 2048)
{
entryOff = ((data.Length % 2048) + 1) * 2048;
continue;
}
break;
}
// Special entries for current and parent directories, skip them
if(record.name_len == 1)
@@ -301,7 +321,17 @@ namespace Aaru.Filesystems
Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(data, entryOff, _directoryRecordSize);
if(record.length == 0)
{
// Skip to next sector
if(data.Length - entryOff >= 2048)
{
entryOff = ((data.Length % 2048) + 1) * 2048;
continue;
}
break;
}
// Special entries for current and parent directories, skip them
if(record.name_len == 1)
@@ -660,10 +690,10 @@ namespace Aaru.Filesystems
if(entry.AmigaComment is null)
entry.AmigaComment = new byte[0];
byte[] newComment = new byte[(entry.AmigaComment.Length +
data
[systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength]
) - 1];
byte[] newComment = new byte[entry.AmigaComment.Length +
data
[systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength] -
1];
Array.Copy(entry.AmigaComment, 0, newComment, 0, entry.AmigaComment.Length);