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 error sector list overflowing total sectors on dump.

Browse Source
This commit is contained in:
Natalia Portillo
2018-02-03 02:53:38 +00:00
parent f1672cd5d3
commit ac7f760a77
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Core/Devices/Dumping/ATA.cs
View File

@@ -272,6 +272,8 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
else else
{ {
if(i + skip > blocks) skip = (uint)(blocks - i);
for(ulong b = i; b < i + skip; b++) resume.BadBlocks.Add(b); for(ulong b = i; b < i + skip; b++) resume.BadBlocks.Add(b);
mhddLog.Write(i, duration < 500 ? 65535 : duration); mhddLog.Write(i, duration < 500 ? 65535 : duration);

2
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -731,6 +731,8 @@ namespace DiscImageChef.Core.Devices.Dumping
// TODO: Reset device after X errors // TODO: Reset device after X errors
if(stopOnError) return; // TODO: Return more cleanly if(stopOnError) return; // TODO: Return more cleanly
if(i + skip > blocks) skip = (uint)(blocks - i);
// Write empty data // Write empty data
DateTime writeStart = DateTime.Now; DateTime writeStart = DateTime.Now;
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)

2
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -385,6 +385,8 @@ namespace DiscImageChef.Core.Devices.Dumping
// TODO: Reset device after X errors // TODO: Reset device after X errors
if(stopOnError) return; // TODO: Return more cleanly if(stopOnError) return; // TODO: Return more cleanly
if(i + skip > blocks) skip = (uint)(blocks - i);
// Write empty data // Write empty data
DateTime writeStart = DateTime.Now; DateTime writeStart = DateTime.Now;
outputPlugin.WriteSectors(new byte[blockSize * skip], i, skip); outputPlugin.WriteSectors(new byte[blockSize * skip], i, skip);

2
DiscImageChef.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -317,6 +317,8 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
else else
{ {
if(i + skip > blocks) skip = (uint)(blocks - i);
for(ulong b = i; b < i + skip; b++) resume.BadBlocks.Add(b); for(ulong b = i; b < i + skip; b++) resume.BadBlocks.Add(b);
mhddLog.Write(i, duration < 500 ? 65535 : duration); mhddLog.Write(i, duration < 500 ? 65535 : duration);

2
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -437,6 +437,8 @@ namespace DiscImageChef.Core.Devices.Dumping
// TODO: Reset device after X errors // TODO: Reset device after X errors
if(stopOnError) return; // TODO: Return more cleanly if(stopOnError) return; // TODO: Return more cleanly
if(i + skip > blocks) skip = (uint)(blocks - i);
// Write empty data // Write empty data
DateTime writeStart = DateTime.Now; DateTime writeStart = DateTime.Now;
outputPlugin.WriteSectors(new byte[BLOCK_SIZE * skip], i, skip); outputPlugin.WriteSectors(new byte[BLOCK_SIZE * skip], i, skip);