feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

freertos/linux: Fix use after scope exit in select() wrap

Browse Source
This commit is contained in:
David Cermak
2023-05-15 10:28:54 +02:00
parent 2327c5cd00
commit a41d360842
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/freertos/esp_additions/FreeRTOSSimulator_wrappers.c
View File

@ -25,12 +25,14 @@ int __wrap_select (int fd, fd_set * rfds, fd_set * wfds, fd_set *efds, struct ti
{ {
int ret; int ret;
struct timeval *tv = tval; struct timeval *tv = tval;
struct timeval timeval_local = {};
int64_t start = 0; int64_t start = 0;
int64_t timeout_us = 0; int64_t timeout_us = 0;
if (tv != NULL) { if (tv != NULL) {
start = get_us(); start = get_us();
timeout_us = tval->tv_sec * 1000000 + tval->tv_usec; timeout_us = tval->tv_sec * 1000000 + tval->tv_usec;
struct timeval timeval_local = { .tv_sec = tval->tv_sec, .tv_usec = tval->tv_usec }; timeval_local.tv_sec = tval->tv_sec;
timeval_local.tv_usec = tval->tv_usec;
tv = &timeval_local; // this (tv != NULL) indicates that we should handle timeouts tv = &timeval_local; // this (tv != NULL) indicates that we should handle timeouts
} }
while ((ret = __real_select(fd, rfds, wfds, efds, tv)) < 0 && errno == EINTR) { while ((ret = __real_select(fd, rfds, wfds, efds, tv)) < 0 && errno == EINTR) {