From 988f74311c26ea9917e84fbae608de226dba7e5f Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Wed, 16 Aug 2023 14:17:36 +0100 Subject: patch 9.1.0047: issues with temp curwin/buf while cmdwin is open Problem: Things that temporarily change/restore curwin/buf (e.g: win_execute, some autocmds) may break assumptions that curwin/buf is the cmdwin when "cmdwin_type != 0", causing issues. Solution: Expose the cmdwin's real win/buf and check that instead. Also try to ensure these variables are NULL if "cmdwin_type == 0", allowing them to be used directly in most cases without checking cmdwin_type. (Sean Dewar) Alternatively, we could ban win_execute in the cmdwin and audit all places that temporarily change/restore curwin/buf, but I didn't notice any problems arising from allowing this (standard cmdwin restrictions still apply, so things that may actually break the cmdwin are still forbidden). closes: #12819 Signed-off-by: Sean Dewar Signed-off-by: Christian Brabandt --- src/drawline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/drawline.c') diff --git a/src/drawline.c b/src/drawline.c index 7bbe86de0f..daf3fbe18f 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1901,7 +1901,7 @@ win_line( if (wlv.draw_state == WL_CMDLINE - 1 && wlv.n_extra == 0) { wlv.draw_state = WL_CMDLINE; - if (cmdwin_type != 0 && wp == curwin) + if (wp == cmdwin_win) { // Draw the cmdline character. wlv.n_extra = 1; -- cgit v1.2.3