commit f0dbd422ccc993df6a28167e4096c49ed96b7999
author Fabio Utzig <utzig@apache.org> Fri Aug 09 10:22:05 2019 -0300
committer Fabio Utzig <utzig@utzig.org> Tue Aug 13 09:44:41 2019 -0300
tree 2249a23f09f78f7d99f4f045f2c9ab09bef5c2e3
parent d638b1778df9b740b62a0a9252783dc08a672959

Return error if swap_type is not identified

While iterating over the swap table looking for swap type,
avoid asserting on errors; let caller handle error handling.

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 84e77e1..46aaa61 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -567,9 +567,11 @@
                          table->swap_type == BOOT_SWAP_TYPE_PERM   ? "perm"   :
                          table->swap_type == BOOT_SWAP_TYPE_REVERT ? "revert" :
                          "BUG; can't happen");
-            assert(table->swap_type == BOOT_SWAP_TYPE_TEST ||
-                   table->swap_type == BOOT_SWAP_TYPE_PERM ||
-                   table->swap_type == BOOT_SWAP_TYPE_REVERT);
+            if (table->swap_type != BOOT_SWAP_TYPE_TEST &&
+                    table->swap_type != BOOT_SWAP_TYPE_PERM &&
+                    table->swap_type != BOOT_SWAP_TYPE_REVERT) {
+                return BOOT_SWAP_TYPE_PANIC;
+            }
             return table->swap_type;
         }
     }