From: Michael McMaster <michael@codesrc.com>
Date: Sat, 29 Apr 2017 04:39:33 +0000 (+1000)
Subject: Fix crash when SD card is smaller than starting sector of scsi disk
X-Git-Tag: v4.7.1~2
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=63ef5824b1967591a9d3f02108810dc284dfca55;p=SCSI2SD.git

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 0666b5a..c3c6bb7 100755
--- a/software/SCSI2SD/src/geometry.c
+++ b/software/SCSI2SD/src/geometry.c
@@ -28,7 +28,16 @@ uint32_t getScsiCapacity(
 	uint32_t capacity =
 		(sdDev.capacity - sdSectorStart) /
 			SDSectorsPerSCSISector(bytesPerSector);
-	if (scsiSectors && (capacity > scsiSectors))
+
+	if (sdDev.capacity == 0)
+	{
+		capacity = 0;
+	}
+	else if (sdSectorStart >= sdDev.capacity)
+	{
+		capacity = 0;
+	}
+	else if (scsiSectors && (capacity > scsiSectors))
 	{
 		capacity = scsiSectors;
 	}
diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit
index c2567cd..4ee1a97 100644
Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit differ