Fix external image hdr_ok state on open failure

F/2580

Author: danielinux

src/image.c

@@ -1451,6 +1451,7 @@ int wolfBoot_open_image_external(struct wolfBoot_image* img, uint8_t part,
     uint8_t* addr)
 {
     uint8_t* image;
+    int ret;
     if (img == NULL)
         return -1;
 
@@ -1460,7 +1461,10 @@ int wolfBoot_open_image_external(struct wolfBoot_image* img, uint8_t part,
     img->hdr_ok = 1;
     hdr_cpy_done = 0; /* reset hdr "open" flag */
     image = fetch_hdr_cpy(img);
-    return wolfBoot_open_image_address(img, image);
+    ret = wolfBoot_open_image_address(img, image);
+    if (ret != 0)
+        img->hdr_ok = 0;
+    return ret;
 }
 #endif /* EXT_FLASH */
 

tools/unit-tests/unit-image.c

@@ -870,6 +870,15 @@ START_TEST(test_open_image)
     ck_assert_ptr_eq(img.fw_base, (uint8_t *)WOLFBOOT_PARTITION_UPDATE_ADDRESS
             + 256);
 
+    /* Invalid external header must keep hdr_ok cleared on failure */
+    ext_flash_erase(0, WOLFBOOT_SECTOR_SIZE);
+    memset(&img, 0, sizeof(img));
+    hdr_cpy_done = 0;
+    ret = wolfBoot_open_image_external(&img, PART_UPDATE,
+            (uint8_t *)WOLFBOOT_PARTITION_UPDATE_ADDRESS);
+    ck_assert_int_eq(ret, -1);
+    ck_assert_uint_eq(img.hdr_ok, 0);
+
     /* Self header must reject sizes beyond the partition payload budget */
     memset(self_hdr, 0xFF, sizeof(self_hdr));
     ((uint32_t *)self_hdr)[0] = WOLFBOOT_MAGIC;