Skip to content

Commit

Permalink
Merge branch 'bugfix/wrong_ota_upgrade_size_log_v5.1' into 'release/v…
Browse files Browse the repository at this point in the history
…5.1'

fix(esp_https_ota): Fix wrong debug print for ota upgrade size (v5.1)

See merge request espressif/esp-idf!27352
  • Loading branch information
mahavirj committed Nov 29, 2023
2 parents 5f35f5d + 7970408 commit 4788804
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions components/esp_https_ota/src/esp_https_ota.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -501,18 +501,18 @@ esp_err_t esp_https_ota_perform(esp_https_ota_handle_t https_ota_handle)
*/
int binary_file_len = 0;
if (handle->binary_file_len) {
/*
* Header length gets added to handle->binary_file_len in _ota_write
* Clear handle->binary_file_len to avoid additional 289 bytes in binary_file_len
*/
binary_file_len = handle->binary_file_len;
handle->binary_file_len = 0;
} else {
if (read_header(handle) != ESP_OK) {
return ESP_FAIL;
}
binary_file_len = IMAGE_HEADER_SIZE;
}
/*
* Header length gets added to handle->binary_file_len in _ota_write
* Clear handle->binary_file_len to avoid additional bytes in upgrade image size calculation
*/
handle->binary_file_len = 0;

const void *data_buf = (const void *) handle->ota_upgrade_buf;
#if CONFIG_ESP_HTTPS_OTA_DECRYPT_CB
Expand Down

0 comments on commit 4788804

Please sign in to comment.