Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from mcu-tools:main #17

Merged
merged 2 commits into from
Jan 17, 2025
Merged

[pull] main from mcu-tools:main #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18b91c
boot: boot_serial: Fix uninitialised variables for upload
nordicjm Jan 15, 2025
0cd1d0a
docs: release-notes: Add note on serial recovery fix
nordicjm Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions boot/boot_serial/src/boot_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ bs_set(char *buf, int len)
uint8_t image_index = 0;
size_t decoded = 0;
uint8_t hash[IMAGE_HASH_SIZE];
bool confirm;
struct zcbor_string img_hash;
bool confirm = false;
struct zcbor_string img_hash = { 0 };
bool ok;
int rc;

Expand Down Expand Up @@ -798,7 +798,7 @@ bs_upload(char *buf, int len)
size_t img_size_tmp = SIZE_MAX; /* Temp variable for image size */
const struct flash_area *fap = NULL;
int rc;
struct zcbor_string img_chunk_data;
struct zcbor_string img_chunk_data = { 0 };
size_t decoded = 0;
bool ok;
#ifdef MCUBOOT_ERASE_PROGRESSIVELY
Expand Down Expand Up @@ -1021,7 +1021,7 @@ bs_upload(char *buf, int len)
}
}
} else {
out_invalid_data:
out_invalid_data:
rc = MGMT_ERR_EINVAL;
}

Expand Down
3 changes: 3 additions & 0 deletions docs/release-notes.d/serial-recovery-var.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Fixed issue with serial recovery variables not being
correctly initialised to default values which could cause
some commands to do unexpected operations
Loading