aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-02 12:46:54 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-02 12:46:54 +0000
commitc99c0285dc5d5fc38fa4dbee1cba70a660578fca (patch)
tree92a09571264f2b9687eed7c67baa3e6113a21f2f
parentserver: don't get stuck in read() if TERM length is 0 (diff)
fdm: fdm_poll(): disallow nested calls
-rw-r--r--fdm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fdm.c b/fdm.c
index e26d394c..c7af68d0 100644
--- a/fdm.c
+++ b/fdm.c
@@ -142,6 +142,12 @@ fdm_del_no_close(struct fdm *fdm, int fd)
bool
fdm_poll(struct fdm *fdm)
{
+ assert(!fdm->is_polling && "nested calls to fdm_poll() not allowed");
+ if (fdm->is_polling) {
+ LOG_ERR("nested calls to fdm_poll() not allowed");
+ return false;
+ }
+
struct epoll_event events[tll_length(fdm->fds)];
int ret = epoll_wait(fdm->epoll_fd, events, tll_length(fdm->fds), -1);
if (ret == -1) {