From 70dfc374ec72634a0a61aea8344178779675d516 Mon Sep 17 00:00:00 2001 From: John Marriott Date: Thu, 16 Jan 2025 18:58:20 +0100 Subject: [PATCH] patch 9.1.1021: string might be used without a trailing NUL Problem: string might be used without a trailing NUL (after v9.1.0997) Solution: Make sure that the buffer is NUL terminated closes: #16457 Signed-off-by: John Marriott Signed-off-by: Christian Brabandt --- src/drawscreen.c | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/drawscreen.c b/src/drawscreen.c index 36034cc9d..a08cea3d6 100644 --- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -479,7 +479,10 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED) || bufIsChanged(wp->w_buffer) || wp->w_buffer->b_p_ro) && plen < MAXPATHL - 1) - *(p + plen++) = ' '; + { + *(p + plen++) = ' '; // replace NUL with space + *(p + plen) = NUL; // NUL terminate the string + } if (bt_help(wp->w_buffer)) plen += vim_snprintf((char *)p + plen, MAXPATHL - plen, "%s", _("[Help]")); #ifdef FEAT_QUICKFIX diff --git a/src/version.c b/src/version.c index 5a47806a5..c360a2416 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1021, /**/ 1020, /**/