From 1825609d8d25d38f81b497f2317f60dbb4f9ad39 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 8 Jul 2009 17:58:32 +0000
Subject: Handle empty or unset TERM correctly; also fix a fatal() message
 while here.

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

(limited to 'server-msg.c')

diff --git a/server-msg.c b/server-msg.c
index 17b67b65..d8983102 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-msg.c,v 1.4 2009/07/07 12:34:47 nicm Exp $ */
+/* $OpenBSD: server-msg.c,v 1.5 2009/07/07 17:24:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -211,7 +211,9 @@ server_msg_fn_identify(struct hdr *hdr, struct client *c)
 		c->tty.term_flags |= TERM_88COLOURS;
 	if (data.flags & IDENTIFY_HASDEFAULTS)
 		c->tty.term_flags |= TERM_HASDEFAULTS;
-	xfree(term);
+
+	if (term != NULL)
+		xfree(term);
 
 	c->flags |= CLIENT_TERMINAL;
 
-- 
cgit