diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-16 21:43:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-16 21:43:54 +0100 |
| commit | 1c0aa97827f30e3051ee50a0690555c2c23c0ceb (patch) | |
| tree | a45575382b93123ba3b613e07ffd4396565673d3 | |
| parent | 530bed993e41bda6f717a8ddd0acb39464f95336 (diff) | |
| download | vim-git-1c0aa97827f30e3051ee50a0690555c2c23c0ceb.tar.gz | |
patch 8.2.2148: Vim9: crash when user command doesn't matchv8.2.2148
Problem: Vim9: crash when user command doesn't match.
Solution: Adjust command index. (closes #7479)
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index b08482232..152eda6c6 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3520,7 +3520,7 @@ find_ex_command( ++p; p = find_ucmd(eap, p, full, NULL, NULL); } - if (p == eap->cmd) + if (p == NULL || p == eap->cmd) eap->cmdidx = CMD_SIZE; } diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 95d696913..bdc9ad06d 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -701,5 +701,14 @@ def Test_cmd_argument_without_colon() delete('Xfile') enddef +def Test_ambiguous_user_cmd() + var lines =<< trim END + com Cmd1 eval 0 + com Cmd2 eval 0 + Cmd + END + CheckScriptFailure(lines, 'E464:') +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index f28bb4a43..a5c7127dc 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2148, +/**/ 2147, /**/ 2146, |