From 88abe2a4cb1574b75f9f72d9468f8f6c351a26fb Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 20 Jul 2021 13:52:53 -0600 Subject: [PATCH 1/3] Fix memory leak on error path in md5_printf --- components/esp_http_client/lib/http_auth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/esp_http_client/lib/http_auth.c b/components/esp_http_client/lib/http_auth.c index 4beec5a8c3..4e64bf691c 100644 --- a/components/esp_http_client/lib/http_auth.c +++ b/components/esp_http_client/lib/http_auth.c @@ -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; } From 7e7d4e291d50bdb52cf59e77137dfb48170820e8 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 20 Jul 2021 13:52:53 -0600 Subject: [PATCH 2/3] Fix memory leak on error path in http_header_set_format --- components/esp_http_client/lib/http_header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_http_client/lib/http_header.c b/components/esp_http_client/lib/http_header.c index 66af197f4d..824bfdc6c4 100644 --- a/components/esp_http_client/lib/http_header.c +++ b/components/esp_http_client/lib/http_header.c @@ -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; } From 06ea5da2c8f9fd93e72223a9bf67e8cd05be4f64 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 20 Jul 2021 13:52:53 -0600 Subject: [PATCH 3/3] 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 --- components/vfs/vfs_uart.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/components/vfs/vfs_uart.c b/components/vfs/vfs_uart.c index 706e8d96f8..9f4457c094 100644 --- a/components/vfs/vfs_uart.c +++ b/components/vfs/vfs_uart.c @@ -356,9 +356,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; @@ -382,12 +384,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; } }