mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix memory leak on error path in register_select 

And remove dead error handling code from unregister_select.

Closes https://github.com/espressif/esp-idf/pull/7296
release/v4.0
Aditya Patwardhan 2021-07-26 14:37:36 +08:00 zatwierdzone przez Zim Kalinowski
rodzic c128769170
commit 269d40c0db
3 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
components/esp_http_client/lib/http_auth.c
Wyświetl plik

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

2
components/esp_http_client/lib/http_header.c
Wyświetl plik

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

13
components/vfs/vfs_uart.c
Wyświetl plik

@ -343,9 +343,11 @@ static esp_err_t register_select(uart_select_args_t *args)
if (args) {
portENTER_CRITICAL(&s_registered_select_lock);
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;
} else {
s_registered_selects = new_selects;
s_registered_selects[s_registered_select_num] = args;
s_registered_select_num = new_size;
ret = ESP_OK;
@ -369,12 +371,9 @@ static esp_err_t unregister_select(uart_select_args_t *args)
// last item.
s_registered_selects[i] = s_registered_selects[new_size];
s_registered_selects = realloc(s_registered_selects, new_size * sizeof(uart_select_args_t *));
if (s_registered_selects || new_size == 0) {
s_registered_select_num = new_size;
ret = ESP_OK;
} else {
ret = ESP_ERR_NO_MEM;
}
// Shrinking a buffer with realloc is guaranteed to succeed.
s_registered_select_num = new_size;
ret = ESP_OK;
break;
}
}