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

🐛Correct reading of non-allocated blocks in VirtualPC disk image.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-04 10:11:52 +00:00
parent 95f8b102a7
commit 185eef0cc0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscImageChef.DiscImages/VHD.cs
View File

@@ -848,6 +848,8 @@ namespace DiscImageChef.DiscImages
// Sector number inside of block // Sector number inside of block
uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512)); uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512));
if(blockAllocationTable[blockNumber] == 0xFFFFFFFF) return new byte[512];
byte[] bitmap = new byte[bitmapSize * 512]; byte[] bitmap = new byte[bitmapSize * 512];
// Offset of block in file // Offset of block in file
@@ -886,6 +888,7 @@ namespace DiscImageChef.DiscImages
byte[] data = new byte[512]; byte[] data = new byte[512];
uint sectorOffset = blockAllocationTable[blockNumber] + bitmapSize + sectorInBlock; uint sectorOffset = blockAllocationTable[blockNumber] + bitmapSize + sectorInBlock;
thisStream = thisFilter.GetDataForkStream(); thisStream = thisFilter.GetDataForkStream();
System.Console.WriteLine("readsector {0}", sectorOffset);
thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin); thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
thisStream.Read(data, 0, 512); thisStream.Read(data, 0, 512);
@@ -949,7 +952,7 @@ namespace DiscImageChef.DiscImages
byte[] prefix = new byte[sectorsToReadHere * 512]; byte[] prefix = new byte[sectorsToReadHere * 512];
// 0xFFFFFFFF means unallocated // 0xFFFFFFFF means unallocated
if(sectorOffset != 0xFFFFFFFF) if(blockAllocationTable[blockNumber] != 0xFFFFFFFF)
{ {
Stream thisStream = thisFilter.GetDataForkStream(); Stream thisStream = thisFilter.GetDataForkStream();
thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin); thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);