From 7d06216289cb36fd7b8a16373d8c527f71816e4e Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 24 Apr 2019 20:27:52 +0000 Subject: [PATCH 1/2] Do not loop forever if there is a nonprintable character in the format. --- format-draw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/format-draw.c b/format-draw.c index b0b050f6..51404254 100644 --- a/format-draw.c +++ b/format-draw.c @@ -837,7 +837,8 @@ format_trim_left(const char *expanded, u_int limit) *out++ = *cp; width++; cp++; - } + } else + cp++; } *out = '\0'; return (copy); @@ -883,7 +884,8 @@ format_trim_right(const char *expanded, u_int limit) *out++ = *cp; width++; cp++; - } + } else + cp++; } *out = '\0'; return (copy); From cb75ec25c8f023b23aa1edd082763e1ca0f14559 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 24 Apr 2019 22:35:23 +0100 Subject: [PATCH 2/2] 2.9 now. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f04ae14d..89e62066 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 2.9-rc3) +AC_INIT([tmux], 2.9) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc)