flash: Correctly signal error on invalid flash read

jepler · jepler · commit de14b5b02f1c · 2020-06-22T10:24:21.000-05:00
This logic was intended to mirror what is done for "write", but
the wrong variable name was repeated twice.
diff --git a/supervisor/shared/flash.c b/supervisor/shared/flash.c
@@ -88,7 +88,7 @@ static void build_partition(uint8_t *buf, int boot, int type, uint32_t start_blo
 
 mp_uint_t flash_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
     if (block_num == 0) {
-        if (block_num > 1) {
+        if (num_blocks > 1) {
             return 1; // error
         }
         // fake the MBR so we can decide on our own partition table

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static void build_partition(uint8_t *buf, int boot, int type, uint32_t start_blo`
`88`	`88`
`89`	`89`	`mp_uint_t flash_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {`
`90`	`90`	`if (block_num == 0) {`
`91`		`- if (block_num > 1) {`
	`91`	`+ if (num_blocks > 1) {`
`92`	`92`	`return 1; // error`
`93`	`93`	`}`
`94`	`94`	`// fake the MBR so we can decide on our own partition table`