IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5148: invalid memory access when using expression on command line (#21113)

Browse Source 
Problem:    Invalid memory access when using an expression on the command line.
Solution:   Make sure the position does not go negative.

6046aded8d

N/A patches for version.c:

vim-patch:8.2.5149: cannot build without the +eval feature

Problem:    Cannot build without the +eval feature. (Tony Mechelynck)
Solution:   Add #ifdefs.

6689df024b

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2022-11-19 14:12:45 +08:00 committed by GitHub
parent 92e51d7e4b
commit c011747b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/ex_getln.c
View File

@ -1613,6 +1613,8 @@ static int command_line_handle_key(CommandLineState *s)
return 0; // back to cmd mode return 0; // back to cmd mode
case Ctrl_R: { // insert register case Ctrl_R: { // insert register
const int save_new_cmdpos = new_cmdpos;
putcmdline('"', true); putcmdline('"', true);
no_mapping++; no_mapping++;
allow_keys++; allow_keys++;
@ -1627,8 +1629,6 @@ static int command_line_handle_key(CommandLineState *s)
no_mapping--; no_mapping--;
allow_keys--; allow_keys--;
// Insert the result of an expression. // Insert the result of an expression.
// Need to save the current command line, to be able to enter
// a new one...
new_cmdpos = -1; new_cmdpos = -1;
if (s->c == '=') { if (s->c == '=') {
if (ccline.cmdfirstc == '=' // can't do this recursively if (ccline.cmdfirstc == '=' // can't do this recursively
@ -1660,8 +1660,12 @@ static int command_line_handle_key(CommandLineState *s)
} }
} }
} }
new_cmdpos = save_new_cmdpos;
// remove the double quote
ccline.special_char = NUL; ccline.special_char = NUL;
redrawcmd(); redrawcmd();
return command_line_changed(s); return command_line_changed(s);
} }

5
src/nvim/testdir/test_cmdline.vim
View File

@ -1850,6 +1850,11 @@ func Test_cmdline_expr()
call assert_equal("\"e \<C-\>\<C-Y>", @:) call assert_equal("\"e \<C-\>\<C-Y>", @:)
endfunc endfunc
" This was making the insert position negative
func Test_cmdline_expr_register()
exe "sil! norm! ?\<C-\>e0\<C-R>0\<Esc>?\<C-\>e0\<CR>"
endfunc
" Test for 'imcmdline' and 'imsearch' " Test for 'imcmdline' and 'imsearch'
" This test doesn't actually test the input method functionality. " This test doesn't actually test the input method functionality.
func Test_cmdline_inputmethod() func Test_cmdline_inputmethod()