Merge pull request #157 from davidgiven/amigacorruption

davidgiven · web-flow · commit 3c54a663b876 · 2020-04-09T00:16:38.000+02:00
Fix some issues causing corruption when reading Amiga disks
diff --git a/arch/amiga/decoder.cc b/arch/amiga/decoder.cc
@@ -32,6 +32,8 @@ AbstractDecoder::RecordType AmigaDecoder::advanceToNextRecord()
 void AmigaDecoder::decodeSectorRecord()
 {
     const auto& rawbits = readRawBits(AMIGA_RECORD_SIZE*16);
+	if (rawbits.size() < (AMIGA_RECORD_SIZE*16))
+		return;
     const auto& rawbytes = toBytes(rawbits).slice(0, AMIGA_RECORD_SIZE*2);
     const auto& bytes = decodeFmMfm(rawbits).slice(0, AMIGA_RECORD_SIZE);
 
diff --git a/lib/reader.cc b/lib/reader.cc
@@ -261,13 +261,13 @@ void readDiskCommand(AbstractDecoder& decoder)
         if (dumpSectors)
         {
             std::cout << "\nDecoded sectors follow:\n\n";
-            for (auto& i : readSectors)
+            for (auto& sector : track->sectors)
             {
-                auto& sector = i.second;
-				std::cout << fmt::format("{}.{:02}.{:02}: I+{:.2f}us with {:.2f}us clock\n",
-                            sector->logicalTrack, sector->logicalSide, sector->logicalSector,
-                            sector->position.ns() / 1000.0, sector->clock / 1000.0);
-				hexdump(std::cout, sector->data);
+				std::cout << fmt::format("{}.{:02}.{:02}: I+{:.2f}us with {:.2f}us clock: status {}\n",
+                            sector.logicalTrack, sector.logicalSide, sector.logicalSector,
+                            sector.position.ns() / 1000.0, sector.clock / 1000.0,
+							sector.status);
+				hexdump(std::cout, sector.data);
 				std::cout << std::endl;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ AbstractDecoder::RecordType AmigaDecoder::advanceToNextRecord()`
`32`	`32`	`void AmigaDecoder::decodeSectorRecord()`
`33`	`33`	`{`
`34`	`34`	`const auto& rawbits = readRawBits(AMIGA_RECORD_SIZE*16);`
	`35`	`+ if (rawbits.size() < (AMIGA_RECORD_SIZE*16))`
	`36`	`+ return;`
`35`	`37`	`const auto& rawbytes = toBytes(rawbits).slice(0, AMIGA_RECORD_SIZE*2);`
`36`	`38`	`const auto& bytes = decodeFmMfm(rawbits).slice(0, AMIGA_RECORD_SIZE);`
`37`	`39`
Original file line number	Diff line number	Diff line change
`@@ -261,13 +261,13 @@ void readDiskCommand(AbstractDecoder& decoder)`
`261`	`261`	`if (dumpSectors)`
`262`	`262`	`{`
`263`	`263`	`std::cout << "\nDecoded sectors follow:\n\n";`
`264`		`- for (auto& i : readSectors)`
	`264`	`+ for (auto& sector : track->sectors)`
`265`	`265`	`{`
`266`		`- auto& sector = i.second;`
`267`		`- std::cout << fmt::format("{}.{:02}.{:02}: I+{:.2f}us with {:.2f}us clock\n",`
`268`		`- sector->logicalTrack, sector->logicalSide, sector->logicalSector,`
`269`		`- sector->position.ns() / 1000.0, sector->clock / 1000.0);`
`270`		`- hexdump(std::cout, sector->data);`
	`266`	`+ std::cout << fmt::format("{}.{:02}.{:02}: I+{:.2f}us with {:.2f}us clock: status {}\n",`
	`267`	`+ sector.logicalTrack, sector.logicalSide, sector.logicalSector,`
	`268`	`+ sector.position.ns() / 1000.0, sector.clock / 1000.0,`
	`269`	`+ sector.status);`
	`270`	`+ hexdump(std::cout, sector.data);`
`271`	`271`	`std::cout << std::endl;`
`272`	`272`	`}`
`273`	`273`	`}`