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

Merge branch 'bugfix/uart_select_free_v4.0' into 'release/v4.0'

Browse Source 
VFS: Fix memory access after free() in UART select() (v4.0)

See merge request espressif/esp-idf!6085
This commit is contained in:
Angus Gratton
2019-09-13 14:49:46 +08:00
parent bb52613bea 63c2834d7b
commit 3194e12479
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/vfs/vfs_uart.c
View File

@@ -474,10 +474,6 @@ static esp_err_t uart_end_select(void *end_select_args)
{ {
uart_select_args_t *args = end_select_args; uart_select_args_t *args = end_select_args;
if (args) {
free(args);
}
portENTER_CRITICAL(uart_get_selectlock()); portENTER_CRITICAL(uart_get_selectlock());
esp_err_t ret = unregister_select(args); esp_err_t ret = unregister_select(args);
for (int i = 0; i < UART_NUM; ++i) { for (int i = 0; i < UART_NUM; ++i) {
@@ -485,6 +481,10 @@ static esp_err_t uart_end_select(void *end_select_args)
} }
portEXIT_CRITICAL(uart_get_selectlock()); portEXIT_CRITICAL(uart_get_selectlock());
if (args) {
free(args);
}
return ret; return ret;
} }