From 4e637b1b610f93d474a60daa4ab78afef66b29bc Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Jul 2015 18:10:26 +0000
Subject: [PATCH] Ignore environment variables that are too long to send to the
 server.

---
 client.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client.c b/client.c
index 4b7bbb1f..63432926 100644
--- a/client.c
+++ b/client.c
@@ -350,6 +350,7 @@ client_send_identify(int flags)
 {
 	const char	 *s;
 	char		**ss;
+	size_t		  sslen;
 	int		  fd;
 	pid_t		  pid;
 
@@ -374,8 +375,11 @@ client_send_identify(int flags)
 	pid = getpid();
 	client_write_one(MSG_IDENTIFY_CLIENTPID, -1, &pid, sizeof pid);
 
-	for (ss = environ; *ss != NULL; ss++)
-		client_write_one(MSG_IDENTIFY_ENVIRON, -1, *ss, strlen(*ss) + 1);
+	for (ss = environ; *ss != NULL; ss++) {
+		sslen = strlen(*ss) + 1;
+		if (sslen <= MAX_IMSGSIZE - IMSG_HEADER_SIZE)
+			client_write_one(MSG_IDENTIFY_ENVIRON, -1, *ss, sslen);
+	}
 
 	client_write_one(MSG_IDENTIFY_DONE, -1, NULL, 0);