espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/memory_leaks_identified_by_cppcheck_v4.2' into 'release/v4.2'

Browse Source 
Fix/memory leaks identified by cppcheck (v4.2)

See merge request espressif/esp-idf!14502
This commit is contained in:
Zim Kalinowski
2021-07-26 06:43:27 +00:00
parent e9198247a0 e5b4d5f348
commit 6fba03f681
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp32s2/esp_ds.c
View File

@ -129,6 +129,7 @@ esp_err_t esp_ds_start_sign(const void *message,
if (result == ETS_DS_INVALID_KEY) { if (result == ETS_DS_INVALID_KEY) {
ds_disable_release(); ds_disable_release();
free(context);
return ESP_ERR_HW_CRYPTO_DS_INVALID_KEY; return ESP_ERR_HW_CRYPTO_DS_INVALID_KEY;
} }

1
components/esp_http_client/lib/http_auth.c
View File

@ -51,6 +51,7 @@ static int md5_printf(char *md, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
len = vasprintf((char **)&buf, fmt, ap); len = vasprintf((char **)&buf, fmt, ap);
if (buf == NULL) { if (buf == NULL) {
va_end(ap);
return ESP_FAIL; return ESP_FAIL;
} }

2
components/esp_http_client/lib/http_header.c
View File

@ -162,8 +162,8 @@ int http_header_set_format(http_header_handle_t header, const char *key, const c
char *buf = NULL; char *buf = NULL;
va_start(argptr, format); va_start(argptr, format);
len = vasprintf(&buf, format, argptr); len = vasprintf(&buf, format, argptr);
HTTP_MEM_CHECK(TAG, buf, return 0);
va_end(argptr); va_end(argptr);
HTTP_MEM_CHECK(TAG, buf, return 0);
if (buf == NULL) { if (buf == NULL) {
return 0; return 0;
} }

13
components/vfs/vfs_uart.c
View File

@ -366,9 +366,11 @@ static esp_err_t register_select(uart_select_args_t *args)
if (args) { if (args) {
portENTER_CRITICAL(&s_registered_select_lock); portENTER_CRITICAL(&s_registered_select_lock);
const int new_size = s_registered_select_num + 1; const int new_size = s_registered_select_num + 1;
if ((s_registered_selects = realloc(s_registered_selects, new_size * sizeof(uart_select_args_t *))) == NULL) { uart_select_args_t **new_selects;
if ((new_selects = realloc(s_registered_selects, new_size * sizeof(uart_select_args_t *))) == NULL) {
ret = ESP_ERR_NO_MEM; ret = ESP_ERR_NO_MEM;
} else { } else {
s_registered_selects = new_selects;
s_registered_selects[s_registered_select_num] = args; s_registered_selects[s_registered_select_num] = args;
s_registered_select_num = new_size; s_registered_select_num = new_size;
ret = ESP_OK; ret = ESP_OK;
@ -392,12 +394,9 @@ static esp_err_t unregister_select(uart_select_args_t *args)
// last item. // last item.
s_registered_selects[i] = s_registered_selects[new_size]; s_registered_selects[i] = s_registered_selects[new_size];
s_registered_selects = realloc(s_registered_selects, new_size * sizeof(uart_select_args_t *)); s_registered_selects = realloc(s_registered_selects, new_size * sizeof(uart_select_args_t *));
if (s_registered_selects || new_size == 0) { // Shrinking a buffer with realloc is guaranteed to succeed.
s_registered_select_num = new_size; s_registered_select_num = new_size;
ret = ESP_OK; ret = ESP_OK;
} else {
ret = ESP_ERR_NO_MEM;
}
break; break;
} }
} }