Mercurial > vim
changeset 13072:50aa6da392ce v8.0.1411
patch 8.0.1411: reading invalid memory with CTRL-W :
commit https://github.com/vim/vim/commit/2efb323e875d2852f63e41c40641760d1d6b069f
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 19 12:27:23 2017 +0100
patch 8.0.1411: reading invalid memory with CTRL-W :
Problem: Reading invalid memory with CTRL-W :.
Solution: Correct the command characters. (closes https://github.com/vim/vim/issues/2469)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 19 Dec 2017 12:30:05 +0100 |
parents | 40e1f60f4eeb |
children | d790c28d0354 |
files | src/normal.c src/ops.c src/testdir/test_window_cmd.vim src/version.c |
diffstat | 4 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -7850,8 +7850,12 @@ n_start_visual_mode(int c) nv_window(cmdarg_T *cap) { if (cap->nchar == ':') + { /* "CTRL-W :" is the same as typing ":"; useful in a terminal window */ + cap->cmdchar = ':'; + cap->nchar = NUL; nv_colon(cap); + } else if (!checkclearop(cap->oap)) do_window(cap->nchar, cap->count0, NUL); /* everything is in window.c */ }
--- a/src/ops.c +++ b/src/ops.c @@ -183,8 +183,15 @@ get_op_type(int char1, int char2) if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ return OP_NR_SUB; for (i = 0; ; ++i) + { if (opchars[i][0] == char1 && opchars[i][1] == char2) break; + if (i == (int)(sizeof(opchars) / sizeof(char [3]) - 1)) + { + internal_error("get_op_type()"); + break; + } + } return i; }
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -467,4 +467,9 @@ func Test_window_contents() call test_garbagecollect_now() endfunc +func Test_window_colon_command() + " This was reading invalid memory. + exe "norm! v\<C-W>:\<C-U>echo v:version" +endfunc + " vim: shiftwidth=2 sts=2 expandtab