Add invalid cluster error checks

Ruben533 · Dec 23, 2017 · ae1471a · ae1471a
1 parent 18905d7
commit ae1471a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SdFat
-version=1.0.3
+version=1.0.4
 author=Bill Greiman <[email protected]>
 maintainer=Bill Greiman <[email protected]>
 sentence=FAT16/FAT32 file system for SD cards.

diff --git a/src/FatLib/FatVolume.cpp b/src/FatLib/FatVolume.cpp
@@ -200,7 +200,10 @@ int8_t FatVolume::fatGet(uint32_t cluster, uint32_t* value) {
   cache_t* pc;
 
   // error if reserved cluster of beyond FAT
-  DBG_HALT_IF(cluster < 2 || cluster > m_lastCluster);
+  if (cluster < 2 || cluster > m_lastCluster) {
+    DBG_FAIL_MACRO;
+    goto fail;
+  }
 
   if (fatType() == 32) {
     lba = m_fatStartBlock + (cluster >> 7);
@@ -266,7 +269,10 @@ bool FatVolume::fatPut(uint32_t cluster, uint32_t value) {
   cache_t* pc;
 
   // error if reserved cluster of beyond FAT
-  DBG_HALT_IF(cluster < 2 || cluster > m_lastCluster);
+  if (cluster < 2 || cluster > m_lastCluster) {
+    DBG_FAIL_MACRO;
+    goto fail;
+  }
 
   if (fatType() == 32) {
     lba = m_fatStartBlock + (cluster >> 7);

diff --git a/src/SdFat.h b/src/SdFat.h
@@ -34,7 +34,7 @@
 #include "SdCard/SdioCard.h"
 //------------------------------------------------------------------------------
 /** SdFat version */
-#define SD_FAT_VERSION "1.0.3"
+#define SD_FAT_VERSION "1.0.4"
 //==============================================================================
 /**
  * \class SdBaseFile