diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-12-06 23:21:56 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-12-06 23:24:09 -0500 |
| commit | f17700544707160fb9588f37d1f3daef4f7bc483 (patch) | |
| tree | a99bb2c763fa8ebc2b68703ad1212bc06936aafd | |
| parent | 4c4997e988e506050563805541322ece396a0368 (diff) | |
| download | rneovim-f17700544707160fb9588f37d1f3daef4f7bc483.tar.gz rneovim-f17700544707160fb9588f37d1f3daef4f7bc483.tar.bz2 rneovim-f17700544707160fb9588f37d1f3daef4f7bc483.zip | |
vim-patch:8.1.0564: setting v:errors to wrong type still possible
Problem: Setting v:errors to wrong type still possible.
Solution: Return after giving an error message. (Christian Brabandt)
https://github.com/vim/vim/commit/88b53fd0521d1e62df17a8a1f2181425e9d4854c
| -rw-r--r-- | src/nvim/eval.c | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval_stuff.vim | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a5d79bcd4a..cd29e4ef19 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19254,6 +19254,7 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv, return; } else if (v->di_tv.v_type != tv->v_type) { EMSG2(_("E963: setting %s to value with wrong type"), name); + return; } } diff --git a/src/nvim/testdir/test_eval_stuff.vim b/src/nvim/testdir/test_eval_stuff.vim index 92e1ec5335..111c85bb95 100644 --- a/src/nvim/testdir/test_eval_stuff.vim +++ b/src/nvim/testdir/test_eval_stuff.vim @@ -11,3 +11,13 @@ endfunction func Test_catch_return_with_error() call assert_equal(1, s:foo()) endfunc + +func Test_E963() + " These commands used to cause an internal error prior to vim 8.1.0563 + let v_e = v:errors + let v_o = v:oldfiles + call assert_fails("let v:errors=''", 'E963:') + call assert_equal(v_e, v:errors) + call assert_fails("let v:oldfiles=''", 'E963:') + call assert_equal(v_o, v:oldfiles) +endfunc |