Merge pull request #157 from davidgiven/amigacorruption

Fix some issues causing corruption when reading Amiga disks

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);
 

lib/bytes.cc

@@ -258,6 +258,11 @@ void Bytes::writeToFile(const std::string& filename) const
     f.close();
 }
 
+void Bytes::writeTo(std::ostream& stream) const
+{
+	stream.write((const char*) cbegin(), size());
+}
+
 ByteReader Bytes::reader() const
 {
     return ByteReader(*this);

lib/bytes.h

@@ -57,6 +57,7 @@ public:
     ByteWriter writer();
 
     void writeToFile(const std::string& filename) const;
+	void writeTo(std::ostream& stream) const;
 
 private:
     std::shared_ptr<std::vector<uint8_t>> _data;

lib/imagewriter/imgimagewriter.cc

@@ -46,7 +46,7 @@ public:
 					if (sector)
 					{
 						outputFile.seekp(sector->logicalTrack*trackSize + sector->logicalSide*headSize + sector->logicalSector*numBytes, std::ios::beg);
-						outputFile.write((const char*) sector->data.cbegin(), sector->data.size());
+						sector->data.slice(0, numBytes).writeTo(outputFile);
 					}
 				}
 			}

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;
             }
         }