Mercurial > vim
changeset 32122:a2dd770c854a v9.0.1392
patch 9.0.1392: using NULL pointer with nested :open command
Commit: https://github.com/vim/vim/commit/7ac5023a5f1a37baafbe1043645f97ba3443d9f6
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 7 21:05:04 2023 +0000
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 07 Mar 2023 22:15:04 +0100 |
| parents | b8cdbccec740 |
| children | fecec9be2bf9 |
| files | src/getchar.c src/testdir/term_util.vim src/testdir/test_ex_mode.vim src/version.c |
| diffstat | 4 files changed, 39 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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 + 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()