From 7fed84898befefa9f535969ba3da24df44ebe8be Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 27 Sep 2020 10:18:52 -0400 Subject: [PATCH] Only handle one client per poll iteration This is a bit of a hack but it avoids some problems with invalid reads when a client gets disconnected --- src/server.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/server.c b/src/server.c index a896e6a..488f2eb 100644 --- a/src/server.c +++ b/src/server.c @@ -322,8 +322,8 @@ client_writable(struct gmnisrv_server *server, struct gmnisrv_client *client) break; case RESPOND_BODY: if (client->bufix >= client->bufln) { - n = fread(client->buf, 1, - sizeof(client->buf), client->body); + n = fread(client->buf, 1, sizeof(client->buf), + client->body); if (n == -1) { client_error(&client->addr, "Error reading response body: %s", @@ -443,13 +443,9 @@ server_run(struct gmnisrv_server *server) for (size_t i = 0; i < server->nclients; ++i) { if ((server->fds[server->nlisten + i].revents & (POLLHUP | POLLERR))) { disconnect_client(server, &server->clients[i]); - --i; - continue; - } - if ((server->fds[server->nlisten + i].revents & POLLIN)) { + } else if ((server->fds[server->nlisten + i].revents & POLLIN)) { client_readable(server, &server->clients[i]); - } - if ((server->fds[server->nlisten + i].revents & POLLOUT)) { + } else if ((server->fds[server->nlisten + i].revents & POLLOUT)) { client_writable(server, &server->clients[i]); } }