Merge pull request #2 from quentinguidee/fix-assert-external-flash

M4xi1m3 · web-flow · commit 126bdd68bbd9 · 2022-03-15T23:59:42.000+01:00
[ion/external_flash] Fix SectorAtAddress assert()
diff --git a/ion/src/device/bootloader/drivers/external_flash.cpp b/ion/src/device/bootloader/drivers/external_flash.cpp
@@ -405,7 +405,7 @@ int SectorAtAddress(uint32_t address) {
   i = address >> NumberOfAddressBitsIn32KbyteBlock;
   if (i >= 1) {
     i = Config::NumberOf4KSectors + i - 1;
-    assert(i >= 0 && i <= Config::NumberOf32KSectors);
+    assert(i >= Config::NumberOf4KSectors && i <= Config::NumberOf4KSectors + Config::NumberOf32KSectors);
     return i;
   }
   i = address >> NumberOfAddressBitsIn4KbyteBlock;

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ int SectorAtAddress(uint32_t address) {`
`405`	`405`	`i = address >> NumberOfAddressBitsIn32KbyteBlock;`
`406`	`406`	`if (i >= 1) {`
`407`	`407`	`i = Config::NumberOf4KSectors + i - 1;`
`408`		`- assert(i >= 0 && i <= Config::NumberOf32KSectors);`
	`408`	`+ assert(i >= Config::NumberOf4KSectors && i <= Config::NumberOf4KSectors + Config::NumberOf32KSectors);`
`409`	`409`	`return i;`
`410`	`410`	`}`
`411`	`411`	`i = address >> NumberOfAddressBitsIn4KbyteBlock;`