From ecaf234c39472f4d4ba839bcfde66e02bb8bcac5 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Tue, 29 May 2018 11:01:25 +0200 Subject: [PATCH] VFS: fix possible memory leak in UART --- components/vfs/vfs_uart.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/vfs/vfs_uart.c b/components/vfs/vfs_uart.c index 4b4762c344..e52b5dd74f 100644 --- a/components/vfs/vfs_uart.c +++ b/components/vfs/vfs_uart.c @@ -89,6 +89,8 @@ static esp_line_endings_t s_rx_mode = ESP_LINE_ENDINGS_LF; #endif +static void uart_end_select(); + // Functions used to write bytes to UART. Default to "basic" functions. static tx_func_t s_uart_tx_func[UART_NUM] = { &uart_tx_char, &uart_tx_char, &uart_tx_char @@ -337,25 +339,25 @@ static esp_err_t uart_start_select(int nfds, fd_set *readfds, fd_set *writefds, if (_readfds || _writefds || _errorfds || _readfds_orig || _writefds_orig || _errorfds_orig || _signal_sem) { taskEXIT_CRITICAL(uart_get_selectlock()); - _lock_release(&s_one_select_lock); + uart_end_select(); return ESP_ERR_INVALID_STATE; } if ((_readfds_orig = malloc(sizeof(fd_set))) == NULL) { taskEXIT_CRITICAL(uart_get_selectlock()); - _lock_release(&s_one_select_lock); + uart_end_select(); return ESP_ERR_NO_MEM; } if ((_writefds_orig = malloc(sizeof(fd_set))) == NULL) { taskEXIT_CRITICAL(uart_get_selectlock()); - _lock_release(&s_one_select_lock); + uart_end_select(); return ESP_ERR_NO_MEM; } if ((_errorfds_orig = malloc(sizeof(fd_set))) == NULL) { taskEXIT_CRITICAL(uart_get_selectlock()); - _lock_release(&s_one_select_lock); + uart_end_select(); return ESP_ERR_NO_MEM; }