patch 8.0.1411: reading invalid memory with CTRL-W :
Problem: Reading invalid memory with CTRL-W :.
Solution: Correct the command characters. (closes #2469)
diff --git a/src/normal.c b/src/normal.c
index 76eb18a..a8e65ff 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -7850,8 +7850,12 @@
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 */
}
diff --git a/src/ops.c b/src/ops.c
index cfa0bb3..83c36bd 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -183,8 +183,15 @@
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;
}
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index 067f09c..925cfcc 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -467,4 +467,9 @@
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
diff --git a/src/version.c b/src/version.c
index cf53357..ec17e4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1411,
+/**/
1410,
/**/
1409,