patch 9.0.1392: using NULL pointer with nested :open command

Problem:    Using NULL pointer with nested :open command.
Solution:   Check that ccline.cmdbuff is not NULL.

diff --git a/src/getchar.c b/src/getchar.c
index 6645be8a0ebd25e5de7ca1d97d369c161e8e7660..dac57eb26c614d8ca6d8542aa6fc8c46a11477a4 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3107,7 +3107,7 @@ check_end_reg_executing(int advance)
     static int
 vgetorpeek(int advance)
 {
-    int                c, c1;
+    int                c;
     int                timedout = FALSE;       // waited for more than 'timeoutlen'
                                        // for mapping to complete or
                                        // 'ttimeoutlen' for complete key code
@@ -3474,7 +3474,7 @@ vgetorpeek(int advance)
                 * to the user with showcmd.
                 */
                showcmd_idx = 0;
-               c1 = 0;
+               int showing_partial = FALSE;
                if (typebuf.tb_len > 0 && advance && !exmode_active)
                {
                    if (((State & (MODE_NORMAL | MODE_INSERT))
@@ -3489,7 +3489,7 @@ vgetorpeek(int advance)
                            edit_putchar(typebuf.tb_buf[typebuf.tb_off
                                                + typebuf.tb_len - 1], FALSE);
                            setcursor(); // put cursor back where it belongs
-                           c1 = 1;
+                           showing_partial = TRUE;
                        }
                        // need to use the col and row from above here
                        old_wcol = curwin->w_wcol;
@@ -3506,8 +3506,10 @@ vgetorpeek(int advance)
                        curwin->w_wrow = old_wrow;
                    }
 
-                   // this looks nice when typing a dead character map
+                   // This looks nice when typing a dead character map.
+                   // There is no actual command line for get_number().
                    if ((State & MODE_CMDLINE)
+                           && get_cmdline_info()->cmdbuff != NULL
 #if defined(FEAT_CRYPT) || defined(FEAT_EVAL)
                            && cmdline_star == 0
 #endif
@@ -3516,7 +3518,7 @@ vgetorpeek(int advance)
                    {
                        putcmdline(typebuf.tb_buf[typebuf.tb_off
                                                + typebuf.tb_len - 1], FALSE);
-                       c1 = 1;
+                       showing_partial = TRUE;
                    }
                }
 
@@ -3550,11 +3552,12 @@ vgetorpeek(int advance)
 
                if (showcmd_idx != 0)
                    pop_showcmd();
-               if (c1 == 1)
+               if (showing_partial)
                {
                    if (State & MODE_INSERT)
                        edit_unputchar();
-                   if (State & MODE_CMDLINE)
+                   if ((State & MODE_CMDLINE)
+                                       && get_cmdline_info()->cmdbuff != NULL)
                        unputcmdline();
                    else
                        setcursor();    // put cursor back where it belongs

diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index 0f03731845054531f3d34ee1b6b84f8ac49af00e..88e2b33d083b106b8d41bfcd1177c997c00f36d8 100644 (file)
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -55,6 +55,7 @@ endfunc
 " "cols" - width of the terminal window (max. 78)
 " "statusoff" - number of lines the status is offset from default
 " "wait_for_ruler" - if zero then don't wait for ruler to show
+" "no_clean" - if non-zero then remove "--clean" from the command
 func RunVimInTerminal(arguments, options)
   " If Vim doesn't exit a swap file remains, causing other tests to fail.
   " Remove it here.
@@ -91,6 +92,10 @@ func RunVimInTerminal(arguments, options)
 
   let cmd = GetVimCommandCleanTerm() .. reset_u7 .. a:arguments
 
+  if get(a:options, 'no_clean', 0)
+    let cmd = substitute(cmd, '--clean', '', '')
+  endif
+
   let options = #{curwin: 1}
   if &termwinsize == ''
     let options.term_rows = rows

diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index a6602227638a1a5f99d034c158da76a4edbb3462..d03ec8f2d81dbeea606bcf16307ca90d30f0f3f7 100644 (file)
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -134,6 +134,28 @@ func Test_open_command_flush_line()
   bwipe!
 endfunc
 
+" FIXME: this doesn't fail without the fix but hangs
+func Skip_Test_open_command_state()
+  " Tricky script that failed because State was not set properly
+  let lines =<< trim END
+      !ls \83
+      0scìi
+      so! Xsourced
+      set t_û0=0
+      v/-/o
+  END
+  call writefile(lines, 'XopenScript', '')
+
+  let sourced = ["!f\u0083\x02\<Esc>z=0"]
+  call writefile(sourced, 'Xsourced', 'b')
+
+  CheckRunVimInTerminal
+  let buf = RunVimInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XopenScript -c qa!', #{rows: 6, wait_for_ruler: 0, no_clean: 1})
+  sleep 3
+
+  call StopVimInTerminal(buf)
+endfunc
+
 " Test for :g/pat/visual to run vi commands in Ex mode
 " This used to hang Vim before 8.2.0274.
 func Test_Ex_global()

diff --git a/src/version.c b/src/version.c
index 0270abdc1ebca2dbfb2cdd7d9a693afef5d4139f..9689d8b2df2a4712a46dc1db17a080e05e2d56e3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1392,
 /**/
     1391,
 /**/