Merge branch 'obsd-master'

Conflicts:
	tmux.h

1 files changed, 2 insertions, 2 deletions

diff --git a/cmd.c b/cmd.c
index eecac462..282fb112 100644
--- a/cmd.c
+++ b/cmd.c
@@ -294,8 +294,8 @@ cmd_print(struct cmd *cmd, char *buf, size_t len)
 	size_t	off, used;
 
 	off = xsnprintf(buf, len, "%s ", cmd->entry->name);
-	if (off < len) {
-		used = args_print(cmd->args, buf + off, len - off);
+	if (off + 1 < len) {
+		used = args_print(cmd->args, buf + off, len - off - 1);
 		if (used == 0)
 			off--;
 		else