aboutsummaryrefslogtreecommitdiff
path: root/server-msg.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-07-08 17:58:32 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-07-08 17:58:32 +0000
commit1825609d8d25d38f81b497f2317f60dbb4f9ad39 (patch)
tree198cc32a9a9c071353b4a70d0faf25d995896362 /server-msg.c
parent43ff216fa6eab2ba27f50ade9308cb30567dfcc7 (diff)
downloadrtmux-1825609d8d25d38f81b497f2317f60dbb4f9ad39.tar.gz
rtmux-1825609d8d25d38f81b497f2317f60dbb4f9ad39.tar.bz2
rtmux-1825609d8d25d38f81b497f2317f60dbb4f9ad39.zip
Handle empty or unset TERM correctly; also fix a fatal() message while here.
Diffstat (limited to 'server-msg.c')
-rw-r--r--server-msg.c6
1 files changed, 4 insertions, 2 deletions
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;