From aeaebc0977b39b8b3fe7d2f6e243c5f535daab1f Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Tue, 22 Feb 2022 13:43:20 +0700 Subject: [PATCH 1/2] bootloader: explicit initialization --- components/bootloader_support/src/bootloader_utility.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c index ecc55efaf6..86ce78898a 100644 --- a/components/bootloader_support/src/bootloader_utility.c +++ b/components/bootloader_support/src/bootloader_utility.c @@ -478,7 +478,7 @@ void bootloader_utility_load_boot_image(const bootloader_state_t *bs, int start_ { int index = start_index; esp_partition_pos_t part; - esp_image_metadata_t image_data; + esp_image_metadata_t image_data = {0}; if (start_index == TEST_APP_INDEX) { if (check_anti_rollback(&bs->test) && try_load_partition(&bs->test, &image_data)) { From 77c3bb9cfe2b120edded61b87cf9e5073ed37d49 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Mon, 30 May 2022 11:44:08 +0700 Subject: [PATCH 2/2] bootloader: suppress -Wstringop-overflow --- components/bootloader_support/src/bootloader_common_loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/bootloader_support/src/bootloader_common_loader.c b/components/bootloader_support/src/bootloader_common_loader.c index ef2de5c285..4a6d244d38 100644 --- a/components/bootloader_support/src/bootloader_common_loader.c +++ b/components/bootloader_support/src/bootloader_common_loader.c @@ -157,7 +157,11 @@ static void update_rtc_retain_mem_crc(void) void bootloader_common_reset_rtc_retain_mem(void) { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstringop-overflow" + #pragma GCC diagnostic ignored "-Warray-bounds" memset(rtc_retain_mem, 0, sizeof(rtc_retain_mem_t)); + #pragma GCC diagnostic pop } uint16_t bootloader_common_get_rtc_retain_mem_reboot_counter(void)