aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2016-10-27 18:28:53 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2016-10-27 18:28:53 +0100
commit4dbbcff72bd86d9761e178caa21cabe0c6e62547 (patch)
tree32f4afa1d23896f24726ced8648d27b77bcc7c09
parent4aa5dd0ee0bef7a6dfeb0b3329d78660ae197201 (diff)
parentb6f00a3945e1e34ca4314c3e1c4b3a08f5b5c982 (diff)
downloadrtmux-4dbbcff72bd86d9761e178caa21cabe0c6e62547.tar.gz
rtmux-4dbbcff72bd86d9761e178caa21cabe0c6e62547.tar.bz2
rtmux-4dbbcff72bd86d9761e178caa21cabe0c6e62547.zip
Merge branch 'master' of github.com:tmux/tmux
-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);