diff --git a/server-msg.c b/server-msg.c
index 5eaa04db..ef01e100 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -196,6 +196,7 @@ server_msg_fn_identify(struct hdr *hdr, struct client *c)
 	c->tty.sy = data.sy;
 
 	c->cwd = NULL;
+	data.cwd[(sizeof data.cwd) - 1] = '\0';
 	if (*data.cwd != '\0')
 		c->cwd = xstrdup(data.cwd);