From 27364345bf68785af58131c47ef46ff081622537 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 1 Aug 2013 23:39:09 +0100
Subject: [PATCH] Don't add client formats when they are NULL.

---
 format.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/format.c b/format.c
index 8c4c7842..16ac53d6 100644
--- a/format.c
+++ b/format.c
@@ -346,8 +346,10 @@ format_client(struct format_tree *ft, struct client *c)
 	format_add(ft, "client_cwd", "%s", c->cwd);
 	format_add(ft, "client_height", "%u", c->tty.sy);
 	format_add(ft, "client_width", "%u", c->tty.sx);
-	format_add(ft, "client_tty", "%s", c->tty.path);
-	format_add(ft, "client_termname", "%s", c->tty.termname);
+	if (c->tty.path != NULL)
+		format_add(ft, "client_tty", "%s", c->tty.path);
+	if (c->tty.termname != NULL)
+		format_add(ft, "client_termname", "%s", c->tty.termname);
 
 	t = c->creation_time.tv_sec;
 	format_add(ft, "client_created", "%lld", (long long) t);