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

VFS: Use convenience function for safe FD_ISSET

Browse Source
This commit is contained in:
Roland Dobai
2018-05-29 11:01:25 +02:00
parent 15b26f8841
commit 634e8cd54b
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/vfs/vfs.c
View File

@@ -728,6 +728,11 @@ static void call_end_selects(int end_index, const fds_triple_t *vfs_fds_triple)
} }
} }
static inline bool esp_vfs_safe_fd_isset(int fd, const fd_set *fds)
{
return fds && FD_ISSET(fd, fds);
}
static int set_global_fd_sets(const fds_triple_t *vfs_fds_triple, int size, fd_set *readfds, fd_set *writefds, fd_set *errorfds) static int set_global_fd_sets(const fds_triple_t *vfs_fds_triple, int size, fd_set *readfds, fd_set *writefds, fd_set *errorfds)
{ {
int ret = 0; int ret = 0;
@@ -737,17 +742,17 @@ static int set_global_fd_sets(const fds_triple_t *vfs_fds_triple, int size, fd_s
if (item->isset) { if (item->isset) {
for (int fd = 0; fd < MAX_FDS; ++fd) { for (int fd = 0; fd < MAX_FDS; ++fd) {
const int local_fd = s_fd_table[fd].local_fd; // single read -> no locking is required const int local_fd = s_fd_table[fd].local_fd; // single read -> no locking is required
if (readfds && FD_ISSET(local_fd, &item->readfds)) { if (readfds && esp_vfs_safe_fd_isset(local_fd, &item->readfds)) {
ESP_LOGD(TAG, "FD %d in readfds was set from VFS ID %d", fd, i); ESP_LOGD(TAG, "FD %d in readfds was set from VFS ID %d", fd, i);
FD_SET(fd, readfds); FD_SET(fd, readfds);
++ret; ++ret;
} }
if (writefds && FD_ISSET(local_fd, &item->writefds)) { if (writefds && esp_vfs_safe_fd_isset(local_fd, &item->writefds)) {
ESP_LOGD(TAG, "FD %d in writefds was set from VFS ID %d", fd, i); ESP_LOGD(TAG, "FD %d in writefds was set from VFS ID %d", fd, i);
FD_SET(fd, writefds); FD_SET(fd, writefds);
++ret; ++ret;
} }
if (errorfds && FD_ISSET(local_fd, &item->errorfds)) { if (errorfds && esp_vfs_safe_fd_isset(local_fd, &item->errorfds)) {
ESP_LOGD(TAG, "FD %d in errorfds was set from VFS ID %d", fd, i); ESP_LOGD(TAG, "FD %d in errorfds was set from VFS ID %d", fd, i);
FD_SET(fd, errorfds); FD_SET(fd, errorfds);
++ret; ++ret;
@@ -764,7 +769,7 @@ static void esp_vfs_log_fd_set(const char *fds_name, const fd_set *fds)
if (fds_name && fds) { if (fds_name && fds) {
ESP_LOGD(TAG, "FDs in %s =", fds_name); ESP_LOGD(TAG, "FDs in %s =", fds_name);
for (int i = 0; i < MAX_FDS; ++i) { for (int i = 0; i < MAX_FDS; ++i) {
if (FD_ISSET(i, fds)) { if (esp_vfs_safe_fd_isset(i, fds)) {
ESP_LOGD(TAG, "%d", i); ESP_LOGD(TAG, "%d", i);
} }
} }
@@ -812,9 +817,9 @@ int esp_vfs_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds
if (is_socket_fd) { if (is_socket_fd) {
if (!socket_select) { if (!socket_select) {
// no socket_select found yet so take a look // no socket_select found yet so take a look
if ((readfds && FD_ISSET(fd, readfds)) || if (esp_vfs_safe_fd_isset(fd, readfds) ||
(writefds && FD_ISSET(fd, writefds)) || esp_vfs_safe_fd_isset(fd, writefds) ||
(errorfds && FD_ISSET(fd, errorfds))) { esp_vfs_safe_fd_isset(fd, errorfds)) {
const vfs_entry_t *vfs = s_vfs[vfs_index]; const vfs_entry_t *vfs = s_vfs[vfs_index];
socket_select = vfs->vfs.socket_select; socket_select = vfs->vfs.socket_select;
} }
@@ -823,19 +828,19 @@ int esp_vfs_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds
} }
fds_triple_t *item = &vfs_fds_triple[vfs_index]; // FD sets for VFS which belongs to fd fds_triple_t *item = &vfs_fds_triple[vfs_index]; // FD sets for VFS which belongs to fd
if (readfds && FD_ISSET(fd, readfds)) { if (esp_vfs_safe_fd_isset(fd, readfds)) {
item->isset = true; item->isset = true;
FD_SET(local_fd, &item->readfds); FD_SET(local_fd, &item->readfds);
FD_CLR(fd, readfds); FD_CLR(fd, readfds);
ESP_LOGD(TAG, "removing %d from readfds and adding as local FD %d to fd_set of VFS ID %d", fd, local_fd, vfs_index); ESP_LOGD(TAG, "removing %d from readfds and adding as local FD %d to fd_set of VFS ID %d", fd, local_fd, vfs_index);
} }
if (writefds && FD_ISSET(fd, writefds)) { if (esp_vfs_safe_fd_isset(fd, writefds)) {
item->isset = true; item->isset = true;
FD_SET(local_fd, &item->writefds); FD_SET(local_fd, &item->writefds);
FD_CLR(fd, writefds); FD_CLR(fd, writefds);
ESP_LOGD(TAG, "removing %d from writefds and adding as local FD %d to fd_set of VFS ID %d", fd, local_fd, vfs_index); ESP_LOGD(TAG, "removing %d from writefds and adding as local FD %d to fd_set of VFS ID %d", fd, local_fd, vfs_index);
} }
if (errorfds && FD_ISSET(fd, errorfds)) { if (esp_vfs_safe_fd_isset(fd, errorfds)) {
item->isset = true; item->isset = true;
FD_SET(local_fd, &item->errorfds); FD_SET(local_fd, &item->errorfds);
FD_CLR(fd, errorfds); FD_CLR(fd, errorfds);