aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-26 14:01:13 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-26 14:01:13 +0100
commitb6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982 (patch)
tree120d8a7ffeb0774aec27ab77acf350b72f2a6f95
parentf523fddf6a5f19e769e21add6632094265819e55 (diff)
parentabea17afd9e85d88a14be0222d094c37ef7975b6 (diff)
downloadrtmux-b6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982.tar.gz
rtmux-b6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982.tar.bz2
rtmux-b6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-load-buffer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 2484bb66..8592ed39 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -73,7 +73,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
if (strcmp(path, "-") == 0) {
cdata = xcalloc(1, sizeof *cdata);
cdata->item = item;
- cdata->bufname = xstrdup(bufname);
+
+ if (bufname != NULL)
+ cdata->bufname = xstrdup(bufname);
error = server_set_stdin_callback(c, cmd_load_buffer_callback,
cdata, &cause);