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

Corrected seeking on VMware FLAT and VMFS disk images.

Browse Source
This commit is contained in:
Natalia Portillo
2017-09-12 05:07:31 +01:00
parent da3cebf5ef
commit 62ed008626
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DiscImageChef.DiscImages/VMware.cs
View File

@@ -370,7 +370,7 @@ namespace DiscImageChef.DiscImages
newExtent.sectors = extHdrCow.sectors; newExtent.sectors = extHdrCow.sectors;
newExtent.type = "SPARSE"; newExtent.type = "SPARSE";
DicConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.access, newExtent.sectors, newExtent.type, newExtent.filter, newExtent.offset); DicConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.access, newExtent.sectors, newExtent.type, newExtent.filename, newExtent.offset);
extents.Add(currentSector, newExtent); extents.Add(currentSector, newExtent);
currentSector += newExtent.sectors; currentSector += newExtent.sectors;
@@ -454,7 +454,7 @@ namespace DiscImageChef.DiscImages
uint.TryParse(MatchExtent.Groups["offset"].Value, out newExtent.offset); uint.TryParse(MatchExtent.Groups["offset"].Value, out newExtent.offset);
uint.TryParse(MatchExtent.Groups["sectors"].Value, out newExtent.sectors); uint.TryParse(MatchExtent.Groups["sectors"].Value, out newExtent.sectors);
newExtent.type = MatchExtent.Groups["type"].Value; newExtent.type = MatchExtent.Groups["type"].Value;
DicConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.access, newExtent.sectors, newExtent.type, newExtent.filter, newExtent.offset); DicConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.access, newExtent.sectors, newExtent.type, newExtent.filename, newExtent.offset);
extents.Add(currentSector, newExtent); extents.Add(currentSector, newExtent);
currentSector += newExtent.sectors; currentSector += newExtent.sectors;
@@ -516,7 +516,7 @@ namespace DiscImageChef.DiscImages
foreach(VMwareExtent extent in extents.Values) foreach(VMwareExtent extent in extents.Values)
{ {
if(extent.filter == null) if(extent.filter == null)
throw new Exception(string.Format("Extent file {0} not found.", extent.filter)); throw new Exception(string.Format("Extent file {0} not found.", extent.filename));
if(extent.access == "NOACCESS") if(extent.access == "NOACCESS")
throw new Exception("Cannot access NOACCESS extents ;)."); throw new Exception("Cannot access NOACCESS extents ;).");
@@ -530,7 +530,7 @@ namespace DiscImageChef.DiscImages
extentStream.Seek(0, SeekOrigin.Begin); extentStream.Seek(0, SeekOrigin.Begin);
if(extentStream.Length < sectorSize) if(extentStream.Length < sectorSize)
throw new Exception(string.Format("Extent {0} is too small.", extent.filter)); throw new Exception(string.Format("Extent {0} is too small.", extent.filename));
VMwareExtentHeader extentHdr = new VMwareExtentHeader(); VMwareExtentHeader extentHdr = new VMwareExtentHeader();
byte[] extentHdr_b = new byte[Marshal.SizeOf(extentHdr)]; byte[] extentHdr_b = new byte[Marshal.SizeOf(extentHdr)];
@@ -754,7 +754,7 @@ namespace DiscImageChef.DiscImages
if(currentExtent.type == "FLAT" || currentExtent.type == "VMFS") if(currentExtent.type == "FLAT" || currentExtent.type == "VMFS")
{ {
dataStream = currentExtent.filter.GetDataForkStream(); dataStream = currentExtent.filter.GetDataForkStream();
dataStream.Seek((long)(currentExtent.offset + ((sectorAddress - extentStartSector) * sectorSize)), SeekOrigin.Begin); dataStream.Seek((long)((currentExtent.offset + (sectorAddress - extentStartSector)) * sectorSize), SeekOrigin.Begin);
sector = new byte[sectorSize]; sector = new byte[sectorSize];
dataStream.Read(sector, 0, sector.Length); dataStream.Read(sector, 0, sector.Length);