Merge pull request #9241 from davidsaada/david_tdbstore_variant_erase_unit_fix

0xc0170 · web-flow · commit 42fee4502df0 · 2019-01-08T09:52:15.000Z
TDBStore: fix bug in sector blank check for variant sized sectors
diff --git a/features/storage/kvstore/tdbstore/TDBStore.cpp b/features/storage/kvstore/tdbstore/TDBStore.cpp
@@ -1409,7 +1409,7 @@ void TDBStore::offset_in_erase_unit(uint8_t area, uint32_t offset,
     }
 
     uint32_t agg_offset = 0;
-    while (bd_offset < agg_offset + _buff_bd->get_erase_size(agg_offset)) {
+    while (bd_offset >= agg_offset + _buff_bd->get_erase_size(agg_offset)) {
         agg_offset += _buff_bd->get_erase_size(agg_offset);
     }
     offset_from_start = bd_offset - agg_offset;

Original file line number	Diff line number	Diff line change
`@@ -1409,7 +1409,7 @@ void TDBStore::offset_in_erase_unit(uint8_t area, uint32_t offset,`
`1409`	`1409`	`}`
`1410`	`1410`
`1411`	`1411`	`uint32_t agg_offset = 0;`
`1412`		`- while (bd_offset < agg_offset + _buff_bd->get_erase_size(agg_offset)) {`
	`1412`	`+ while (bd_offset >= agg_offset + _buff_bd->get_erase_size(agg_offset)) {`
`1413`	`1413`	`agg_offset += _buff_bd->get_erase_size(agg_offset);`
`1414`	`1414`	`}`
`1415`	`1415`	`offset_from_start = bd_offset - agg_offset;`