commit 1d96f36d01a27a1dd1777aeb8e7abeab1770bffc
author Hovland, Sigvart <sigvart.hovland@nordicsemi.no> Tue Sep 25 13:23:42 2018 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Wed Sep 26 13:22:03 2018 +0200
tree f8373a1f8848907e9173a32f5a03432fa7fe54d6
parent 42ad446fb0516d27dd387e477ef58d6d76589e2c

Fix the wrong size of array of magic word in bootutil_misc

This will fix #335 by defining the array size of the magic word and
give it to the relevant functions.

Signed-off-by: Hovland, Sigvart <sigvart.hovland@nordicsemi.no>

boot/bootutil/src/bootutil_misc.c

diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index b1bea5d..6d992b4 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -43,6 +43,9 @@
     0x8079b62c,
 };
 
+#define BOOT_MAGIC_ARR_SZ \
+    (sizeof boot_img_magic / sizeof boot_img_magic[0])
+
 const uint32_t BOOT_MAGIC_SZ = sizeof boot_img_magic;
 const uint32_t BOOT_MAX_ALIGN = MAX_FLASH_ALIGN;
 
@@ -220,7 +223,7 @@
 boot_read_swap_state(const struct flash_area *fap,
                      struct boot_swap_state *state)
 {
-    uint32_t magic[BOOT_MAGIC_SZ];
+    uint32_t magic[BOOT_MAGIC_ARR_SZ];
     uint32_t off;
     int rc;
 
@@ -280,7 +283,7 @@
 int
 boot_read_swap_size(uint32_t *swap_size)
 {
-    uint32_t magic[BOOT_MAGIC_SZ];
+    uint32_t magic[BOOT_MAGIC_ARR_SZ];
     uint32_t off;
     const struct flash_area *fap;
     int rc;