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

ISO9660 xattr length is not included in directory record size.

Browse Source
This commit is contained in:
Natalia Portillo
2019-07-31 22:04:47 +01:00
parent 06662b7995
commit d6da209fdc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DiscImageChef.Filesystems/ISO9660/File.cs
View File

@@ -89,16 +89,15 @@ namespace DiscImageChef.Filesystems.ISO9660
if(entry.Extents is null) return Errno.InvalidArgument; if(entry.Extents is null) return Errno.InvalidArgument;
if(entry.Size - entry.XattrLength == 0) if(entry.Size == 0)
{ {
buf = new byte[0]; buf = new byte[0];
return Errno.NoError; return Errno.NoError;
} }
if(offset >= (long)entry.Size - entry.XattrLength) return Errno.InvalidArgument; if(offset >= (long)entry.Size) return Errno.InvalidArgument;
if(size + offset + entry.XattrLength >= (long)entry.Size) if(size + offset >= (long)entry.Size) size = (long)entry.Size - offset;
size = (long)entry.Size - offset - entry.XattrLength;
offset += entry.XattrLength; offset += entry.XattrLength;
@@ -136,7 +135,7 @@ namespace DiscImageChef.Filesystems.ISO9660
Attributes = new FileAttributes(), Attributes = new FileAttributes(),
Blocks = (long)(entry.Size / 2048), // TODO: XA Blocks = (long)(entry.Size / 2048), // TODO: XA
BlockSize = 2048, BlockSize = 2048,
Length = (long)(entry.Size - entry.XattrLength), Length = (long)entry.Size,
Inode = entry.Extents?[0].extent ?? 0, Inode = entry.Extents?[0].extent ?? 0,
Links = 1, Links = 1,
LastWriteTimeUtc = entry.Timestamp LastWriteTimeUtc = entry.Timestamp