Skip to content

UpdateManager: abort HTTPS OTA handle on failure #23

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesmulcahy wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

UpdateManager: abort HTTPS OTA handle on failure #23

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
3 changes: 3 additions & 0 deletions firmware_espidf/lib/UpdateManager/UpdateManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,7 @@ esp_err_t UpdateManager::_update_firmware_ota() {
ret = esp_https_ota_get_img_desc(https_ota_handle, &app_desc);
if (ret != ESP_OK) {
ESP_LOGE("UpdateManager", "esp_https_ota_get_img_desc failed");
esp_https_ota_abort(https_ota_handle);
return ESP_ERR_NOT_FINISHED;
}

Expand Down Expand Up @@ -657,6 +658,8 @@ esp_err_t UpdateManager::_update_firmware_ota() {
return ESP_ERR_NOT_FINISHED;
}
} else {
// esp_https_ota_finish frees the handle on its own; on this path it must be released explicitly.
esp_https_ota_abort(https_ota_handle);
esp_event_post(UPDATEMANAGER_EVENT, updatemanager_event_t::FIRMWARE_UPDATE_FINISHED, NULL, 0, pdMS_TO_TICKS(500));
ESP_LOGI("UpdateManager", "Firmware OTA update failed: %s", esp_err_to_name(ret));
return ESP_ERR_NOT_FINISHED;
Expand Down