Skip to content

[nrf noup] boot: zephyr: decompression: Fix stray sizeof() usage #370

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

Merged
merged 1 commit into from
Nov 5, 2024
Merged

[nrf noup] boot: zephyr: decompression: Fix stray sizeof() usage #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions boot/zephyr/decompression.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ int boot_copy_region_decompress(struct boot_loader_state *state, const struct fl
if (protected_tlv_size > 0) {
rc = boot_copy_protected_tlvs(hdr, fap_src, fap_dst, (off_dst + hdr->ih_hdr_size +
write_pos), protected_tlv_size,
decomp_buf, sizeof(decomp_buf_size), &decomp_buf_size,
decomp_buf, DECOMP_BUF_SIZE, &decomp_buf_size,
&tlv_write_size);

if (rc) {
Expand All @@ -1191,7 +1191,7 @@ int boot_copy_region_decompress(struct boot_loader_state *state, const struct fl
tlv_write_size = 0;
rc = boot_copy_unprotected_tlvs(hdr, fap_src, fap_dst, (off_dst + hdr->ih_hdr_size +
write_pos), unprotected_tlv_size,
decomp_buf, sizeof(decomp_buf_size), &decomp_buf_size,
decomp_buf, DECOMP_BUF_SIZE, &decomp_buf_size,
&tlv_write_size);

if (rc) {
Expand Down Expand Up @@ -1219,7 +1219,7 @@ int boot_copy_region_decompress(struct boot_loader_state *state, const struct fl

if (rc != 0) {
BOOT_LOG_ERR("Flash write failed at offset: 0x%x, size: 0x%x, area: %d, rc: %d",
(off_dst + hdr->ih_hdr_size + write_pos), sizeof(decomp_buf_size),
(off_dst + hdr->ih_hdr_size + write_pos), decomp_buf_size,
fap_dst->fa_id, rc);
rc = BOOT_EFLASH;
goto finish;
Expand Down
Loading