commit 9d160091fa231af57ffa0843f49a23193bdbaa60
author Fabio Utzig <utzig@apache.org> Fri Aug 09 07:46:34 2019 -0300
committer Fabio Utzig <utzig@utzig.org> Tue Aug 13 09:44:41 2019 -0300
tree 2397fc910e10958df6e8a98ade39b6fdf4a752b2
parent 15c1467fa261a6a31d3302e4d1fcb093d513dc72

Remove assert from boot_status_entries

Just move error handling to caller routine.

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/bootutil/src/bootutil_misc.c

diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index 97066e7..35b9f15 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -178,11 +178,8 @@
     } else if (fap->fa_id == FLASH_AREA_IMAGE_PRIMARY(image_index) ||
                fap->fa_id == FLASH_AREA_IMAGE_SECONDARY(image_index)) {
         return BOOT_STATUS_STATE_COUNT * BOOT_STATUS_MAX_ENTRIES;
-    } else {
-        /* FIXME: make error values negative and check on caller */
-        assert(0);
-        return BOOT_EBADARGS;
     }
+    return -1;
 }
 
 uint32_t

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index fc5d09c..e01d00e 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -577,6 +577,9 @@
 
     off = boot_status_off(fap);
     max_entries = boot_status_entries(BOOT_CURR_IMG(state), fap);
+    if (max_entries < 0) {
+        return BOOT_EBADARGS;
+    }
 
     found = 0;
     found_idx = 0;