aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-02 11:17:30 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-02 11:17:30 +0000
commit338747dc5a3f655dc6b565902f05dd798f975374 (patch)
treecb3c066b9186f19e9e675453ae2d9a351008ded9
parentserver: don't get stuck in read() if length of argv argument is 0 (diff)
server: don't get stuck in read() if TERM length is 0
-rw-r--r--server.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/server.c b/server.c
index 99288fba..6ad6230e 100644
--- a/server.c
+++ b/server.c
@@ -113,8 +113,10 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
term_env = malloc(term_env_len + 1);
term_env[term_env_len] = '\0';
- if (recv(fd, term_env, term_env_len, 0) != term_env_len)
- goto shutdown;
+ if (term_env_len > 0) {
+ if (recv(fd, term_env, term_env_len, 0) != term_env_len)
+ goto shutdown;
+ }
if (recv(fd, &client->argc, sizeof(client->argc), 0) != sizeof(client->argc))
goto shutdown;