Fix D64 to not read past the end of a sector on large reads.

FujiNetWIFI · Nov 9, 2024 · 1fecea8 · 1fecea8
1 parent 41b8fc2
commit 1fecea8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/meatloaf/disk/d64.cpp b/lib/meatloaf/disk/d64.cpp
@@ -382,6 +382,9 @@ uint16_t D64MStream::readFile(uint8_t *buf, uint16_t size)
 
     if (size > 0)
     {
+        // Only read up to the bytes remaining in this sector
+        size = std::min(size, (uint16_t) (block_size - sector_offset % block_size));
+
         bytesRead += readContainer(buf, size);
         sector_offset += bytesRead;