Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a fatal bug in DiskDump when using the --dir option

Browse source
This commit is contained in:
Jeff Parsons 2015-02-06 11:07:26 -08:00 • committed by jeffpar
commit c25a3be659
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/diskdump/lib/diskdump.js
View file

@ -1729,6 +1729,12 @@ DiskDump.prototype.buildClusters = function(aFiles, offDisk, cbCluster, iParentC
this.cWritesPending++; this.cWritesPending++;
(function readClusters(file, cb, off) { (function readClusters(file, cb, off) {
fs.readFile(file.FILE_PATH, function doneReadClusters(err, buf) { fs.readFile(file.FILE_PATH, function doneReadClusters(err, buf) {
/*
* If cWritesPending has been prematurely zeroed, we assume that's because the buildClusters()
* caller discovered a problem (eg, the total number of clusters exceeds what can fit in the image),
* so we bail.
*/
if (!obj.cWritesPending) return;
if (!err) { if (!err) {
if (fDebug && cb != buf.length) DiskDump.logConsole(file.FILE_NAME + ": initial size (" + cb + ") does not match actual size (" + buf.length + ")"); if (fDebug && cb != buf.length) DiskDump.logConsole(file.FILE_NAME + ": initial size (" + cb + ") does not match actual size (" + buf.length + ")");
buf.copy(obj.bufDisk, off); buf.copy(obj.bufDisk, off);
@ -1777,7 +1783,7 @@ DiskDump.prototype.buildClusters = function(aFiles, offDisk, cbCluster, iParentC
} }
} }
if (iLevel) { if (!iLevel) {
if (!this.cWritesPending) done(null); if (!this.cWritesPending) done(null);
} }
@ -2070,11 +2076,11 @@ DiskDump.prototype.buildImageFromFiles = function(aFiles, done)
if (offDisk > cbDisk) { if (offDisk > cbDisk) {
err = new Error("too much data for disk image (" + cClusters + " clusters required)"); err = new Error("too much data for disk image (" + cClusters + " clusters required)");
this.cWritesPending = 0;
done(err); done(err);
return false; return false;
} }
done(null);
return true; return true;
}; };