espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix-clean-up-in-error-condition-in-http-example_v5.0' into 'release/v5.0'

Browse Source 
fix(example/http): Fixed potential memory leak/crash in when handling error condition (v5.0)

See merge request espressif/esp-idf!27876
This commit is contained in:
Mahavir Jain
2023-12-20 16:42:25 +08:00
parent a20d0b234c 2e9999d7b1
commit 4272b44315
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/protocols/https_request/main/time_sync.c
View File

@@ -62,12 +62,12 @@ static void obtain_time(void)
void fetch_and_store_time_in_nvs(void *args) void fetch_and_store_time_in_nvs(void *args)
{ {
nvs_handle_t my_handle = 0;
esp_err_t err;
initialize_sntp(); initialize_sntp();
obtain_time(); obtain_time();
nvs_handle_t my_handle;
esp_err_t err;
time_t now; time_t now;
time(&now); time(&now);
@@ -88,10 +88,12 @@ void fetch_and_store_time_in_nvs(void *args)
goto exit; goto exit;
} }
nvs_close(my_handle); exit:
if (my_handle != 0) {
nvs_close(my_handle);
}
esp_sntp_stop(); esp_sntp_stop();
exit:
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Error updating time in nvs"); ESP_LOGE(TAG, "Error updating time in nvs");
} else { } else {
@@ -101,7 +103,7 @@ exit:
esp_err_t update_time_from_nvs(void) esp_err_t update_time_from_nvs(void)
{ {
nvs_handle_t my_handle; nvs_handle_t my_handle = 0;
esp_err_t err; esp_err_t err;
err = nvs_open(STORAGE_NAMESPACE, NVS_READWRITE, &my_handle); err = nvs_open(STORAGE_NAMESPACE, NVS_READWRITE, &my_handle);
@@ -123,6 +125,8 @@ esp_err_t update_time_from_nvs(void)
} }
exit: exit:
nvs_close(my_handle); if (my_handle != 0) {
nvs_close(my_handle);
}
return err; return err;
} }