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 <seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/drawline.c b/src/drawline.c
index 7bbe86de0f4931adc8aa2ba5f353be8eaa44e5e4..daf3fbe18f6848d7cd20c69ad4770037206ab4d7 100644 (file)
--- 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;

diff --git a/src/drawscreen.c b/src/drawscreen.c
index a2f60a64ff9b74dad4cb244756dc57a433754f1b..5eb531db8e2b781501d46df2c3b02c87142f346b 100644 (file)
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -1087,7 +1087,7 @@ fold_line(
 
     // 1. Add the cmdwin_type for the command-line window
     // Ignores 'rightleft', this window is never right-left.
-    if (cmdwin_type != 0 && wp == curwin)
+    if (wp == cmdwin_win)
     {
        ScreenLines[off] = cmdwin_type;
        ScreenAttrs[off] = HL_ATTR(HLF_AT);

diff --git a/src/evalwindow.c b/src/evalwindow.c
index fde90f25610f18f17fa0f9da921819d4d1a4f85e..7d035d53b0386e174be27dff6f78e4034e6c1fcc 100644 (file)
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -1076,7 +1076,7 @@ f_win_gettype(typval_T *argvars, typval_T *rettv)
     else if (WIN_IS_POPUP(wp))
        rettv->vval.v_string = vim_strsave((char_u *)"popup");
 #endif
-    else if (wp == curwin && cmdwin_type != 0)
+    else if (wp == cmdwin_win)
        rettv->vval.v_string = vim_strsave((char_u *)"command");
 #ifdef FEAT_QUICKFIX
     else if (bt_quickfix(wp->w_buffer))

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index eacff50d137959fdacf5ce6399a83d5a17ecd412..e7f689b83fabe88f7ebb63270567c1ff88acaab0 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2782,9 +2782,16 @@ do_ecmd(
        {
            bufref_T    save_au_new_curbuf;
            int         save_cmdwin_type = cmdwin_type;
+           win_T       *save_cmdwin_win = cmdwin_win;
+
+           // Should only be possible to get here if the cmdwin is closed, or
+           // if it's opening and its buffer hasn't been set yet (the new
+           // buffer is for it).
+           assert(cmdwin_buf == NULL);
 
            // BufLeave applies to the old buffer.
            cmdwin_type = 0;
+           cmdwin_win = NULL;
 
            /*
             * Be careful: The autocommands may delete any buffer and change
@@ -2801,7 +2808,10 @@ do_ecmd(
            save_au_new_curbuf = au_new_curbuf;
            set_bufref(&au_new_curbuf, buf);
            apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
+
            cmdwin_type = save_cmdwin_type;
+           cmdwin_win = save_cmdwin_win;
+
            if (!bufref_valid(&au_new_curbuf))
            {
                // new buffer has been deleted

diff --git a/src/ex_getln.c b/src/ex_getln.c
index f2a960e234d13f154ae2578d4f78aa6c3efd72f9..e20842b64526ef82e3cd8d516fe8ef3750c5c733 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4494,8 +4494,9 @@ open_cmdwin(void)
     // Don't let quitting the More prompt make this fail.
     got_int = FALSE;
 
-    // Set "cmdwin_type" before any autocommands may mess things up.
+    // Set "cmdwin_..." variables before any autocommands may mess things up.
     cmdwin_type = get_cmdline_type();
+    cmdwin_win = curwin;
 
     // Create the command-line buffer empty.
     if (do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL) == FAIL)
@@ -4504,8 +4505,10 @@ open_cmdwin(void)
        win_close(curwin, TRUE);
        ga_clear(&winsizes);
        cmdwin_type = 0;
+       cmdwin_win = NULL;
        return Ctrl_C;
     }
+    cmdwin_buf = curbuf;
 
     apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf);
     (void)setfname(curbuf, (char_u *)_("[Command Line]"), NULL, TRUE);
@@ -4615,6 +4618,8 @@ open_cmdwin(void)
 # endif
 
     cmdwin_type = 0;
+    cmdwin_buf = NULL;
+    cmdwin_win = NULL;
     exmode_active = save_exmode;
 
     // Safety check: The old window or buffer was deleted: It's a bug when

diff --git a/src/globals.h b/src/globals.h
index b74ef35414d82553d12adeefe9ba9e6e9c18c30e..dd3d2084fdf75090895b2e106b462f32a6c1f13d 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1686,6 +1686,8 @@ EXTERN int        km_startsel INIT(= FALSE);
 
 EXTERN int     cmdwin_type INIT(= 0);  // type of cmdline window or 0
 EXTERN int     cmdwin_result INIT(= 0); // result of cmdline window or 0
+EXTERN buf_T   *cmdwin_buf INIT(= NULL); // buffer of cmdline window or NULL
+EXTERN win_T   *cmdwin_win INIT(= NULL); // window of cmdline window or NULL
 
 EXTERN char_u no_lines_msg[]   INIT(= N_("--No lines in buffer--"));
 

diff --git a/src/gui.c b/src/gui.c
index 16c1b54c67926b1f832830207f53eaf0d8d77cb0..223ede2828b321ccaa8b9831e5bfdf39a9e7f9c3 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -3980,7 +3980,7 @@ gui_drag_scrollbar(scrollbar_T *sb, long value, int still_dragging)
     if (hold_gui_events)
        return;
 
-    if (cmdwin_type != 0 && sb->wp != curwin)
+    if (cmdwin_type != 0 && sb->wp != cmdwin_win)
        return;
 
     if (still_dragging)

diff --git a/src/mouse.c b/src/mouse.c
index b283c6479a5d4c8acdca2ace417809c457ce66c1..b0db60f11f298dce01066cf59983620fe3c28eea 100644 (file)
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1696,7 +1696,7 @@ retnomove:
        }
 #if defined(FEAT_CLIPBOARD)
        // Continue a modeless selection in another window.
-       if (cmdwin_type != 0 && row < curwin->w_winrow)
+       if (cmdwin_type != 0 && row < cmdwin_win->w_winrow)
            return IN_OTHER_WIN;
 #endif
 #ifdef FEAT_PROP_POPUP
@@ -1824,7 +1824,7 @@ retnomove:
 # ifdef FEAT_RIGHTLEFT
                            wp->w_p_rl ? col < wp->w_width - wp->w_p_fdc :
 # endif
-                           col >= wp->w_p_fdc + (cmdwin_type == 0 && wp == curwin ? 0 : 1)
+                           col >= wp->w_p_fdc + (wp != cmdwin_win ? 0 : 1)
                            )
 #endif
                        && (flags & MOUSE_MAY_STOP_VIS))))
@@ -1832,7 +1832,7 @@ retnomove:
            end_visual_mode_keep_button();
            redraw_curbuf_later(UPD_INVERTED);  // delete the inversion
        }
-       if (cmdwin_type != 0 && wp != curwin)
+       if (cmdwin_type != 0 && wp != cmdwin_win)
        {
            // A click outside the command-line window: Use modeless
            // selection if possible.  Allow dragging the status lines.
@@ -1844,7 +1844,7 @@ retnomove:
 #else
            row = 0;
            col += wp->w_wincol;
-           wp = curwin;
+           wp = cmdwin_win;
 #endif
        }
 #if defined(FEAT_PROP_POPUP) && defined(FEAT_TERMINAL)
@@ -1937,7 +1937,7 @@ retnomove:
 
 #if defined(FEAT_CLIPBOARD)
        // Continue a modeless selection in another window.
-       if (cmdwin_type != 0 && row < curwin->w_winrow)
+       if (cmdwin_type != 0 && row < cmdwin_win->w_winrow)
            return IN_OTHER_WIN;
 #endif
 #ifdef FEAT_PROP_POPUP
@@ -2075,7 +2075,7 @@ retnomove:
 # ifdef FEAT_RIGHTLEFT
            curwin->w_p_rl ? col < curwin->w_width - curwin->w_p_fdc :
 # endif
-           col >= curwin->w_p_fdc + (cmdwin_type == 0 ? 0 : 1)
+           col >= curwin->w_p_fdc + (cmdwin_win != curwin ? 0 : 1)
        )
        mouse_char = ' ';
 #endif

diff --git a/src/move.c b/src/move.c
index 861d84b84e33712ce18f27660100ce8d07dd2905..5d2fece63a77bcd4c178c0fbfdaca55c2c133795 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1067,7 +1067,7 @@ validate_cursor_col(void)
 win_col_off(win_T *wp)
 {
     return (((wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) + 1 : 0)
-           + (cmdwin_type == 0 || wp != curwin ? 0 : 1)
+           + (wp != cmdwin_win ? 0 : 1)
 #ifdef FEAT_FOLDING
            + wp->w_p_fdc
 #endif

diff --git a/src/testdir/test_cmdwin.vim b/src/testdir/test_cmdwin.vim
index 5ba16db2f3674b0f36a90181d36850fe273cdd12..0c7d29710fe9cf635ba5e1593c26780ef4d67e8c 100644 (file)
--- a/src/testdir/test_cmdwin.vim
+++ b/src/testdir/test_cmdwin.vim
@@ -470,4 +470,37 @@ func Test_cmdwin_restore_heights()
   set cmdheight& showtabline& laststatus&
 endfunc
 
+func Test_cmdwin_temp_curwin()
+  func CheckWraps(expect_wrap)
+    setlocal textwidth=0 wrapmargin=1
+
+    call deletebufline('', 1, '$')
+    let as = repeat('a', winwidth(0) - 2 - &wrapmargin)
+    call setline(1, as .. ' b')
+    normal! gww
+
+    setlocal textwidth& wrapmargin&
+    call assert_equal(a:expect_wrap ? [as, 'b'] : [as .. ' b'], getline(1, '$'))
+  endfunc
+
+  func CheckCmdWin()
+    call assert_equal('command', win_gettype())
+    " textoff and &wrapmargin formatting considers the cmdwin_type char.
+    call assert_equal(1, getwininfo(win_getid())[0].textoff)
+    call CheckWraps(1)
+  endfunc
+
+  func CheckOtherWin()
+    call assert_equal('', win_gettype())
+    call assert_equal(0, getwininfo(win_getid())[0].textoff)
+    call CheckWraps(0)
+  endfunc
+
+  call feedkeys("q::call CheckCmdWin()\<CR>:call win_execute(win_getid(winnr('#')), 'call CheckOtherWin()')\<CR>:q<CR>", 'ntx')
+
+  delfunc CheckWraps
+  delfunc CheckCmdWin
+  delfunc CheckOtherWin
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/textformat.c b/src/textformat.c
index a1a3e161acbca030aef3a3611ed1c5d83403954a..5a52950c5e25cec1ea3477f6f824a74b085c51ec 100644 (file)
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -795,7 +795,7 @@ comp_textwidth(
        // The width is the window width minus 'wrapmargin' minus all the
        // things that add to the margin.
        textwidth = curwin->w_width - curbuf->b_p_wm;
-       if (cmdwin_type != 0)
+       if (curbuf == cmdwin_buf)
            textwidth -= 1;
 #ifdef FEAT_FOLDING
        textwidth -= curwin->w_p_fdc;

diff --git a/src/version.c b/src/version.c
index ccfcb16a9a4beb8b627f74460e1b09631f2f56f6..85900e124e2a4cd0ec12e5f62462ecced6c757f1 100644 (file)
--- 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 */
+/**/
+    47,
 /**/
     46,
 /**/

diff --git a/src/window.c b/src/window.c
index d9d3401e648b08bcf95b991b89b061825db34421..2e1204345446ab687e023e14c23721214457194c 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3375,6 +3375,8 @@ win_free_all(void)
 
     // avoid an error for switching tabpage with the cmdline window open
     cmdwin_type = 0;
+    cmdwin_buf = NULL;
+    cmdwin_win = NULL;
 
     while (first_tabpage->tp_next != NULL)
        tabpage_close(TRUE);