Fix crash when SD card is smaller than starting sector of scsi disk

diff --git a/software/SCSI2SD/src/geometry.c b/software/SCSI2SD/src/geometry.c
index 0666b5a2863bd185a39580e67a6c61b74b975fd9..c3c6bb7cfc632d8e374071511cce86e8d08e4496 100755 (executable)
--- a/software/SCSI2SD/src/geometry.c
+++ b/software/SCSI2SD/src/geometry.c
@@ -28,7 +28,16 @@ uint32_t getScsiCapacity(
        uint32_t capacity =\r
                (sdDev.capacity - sdSectorStart) /\r
                        SDSectorsPerSCSISector(bytesPerSector);\r
-       if (scsiSectors && (capacity > scsiSectors))\r
+\r
+       if (sdDev.capacity == 0)\r
+       {\r
+               capacity = 0;\r
+       }\r
+       else if (sdSectorStart >= sdDev.capacity)\r
+       {\r
+               capacity = 0;\r
+       }\r
+       else if (scsiSectors && (capacity > scsiSectors))\r
        {\r
                capacity = scsiSectors;\r
        }\r

diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit
index c2567cd77d6a32616c18111926716353d97dd092..4ee1a975b08e06b33a6c5662a768749cfb49ce5d 100644 (file)
Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit differ