Mercurial > vim
changeset 22423:5b35b477eff0 v8.2.1760
patch 8.2.1760: Vim9: crash when end marker is missing
Commit: https://github.com/vim/vim/commit/2914a20abc78d4ace94d48d6e6ab9f0da894dd7e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 27 18:24:03 2020 +0200
patch 8.2.1760: Vim9: crash when end marker is missing
Problem: Vim9: crash when end marker is missing. (Dhiraj Mishra)
Solution: Check for end of function lines. (closes https://github.com/vim/vim/issues/7031)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Sep 2020 18:30:03 +0200 |
| parents | 8e8febe4ddfc |
| children | 2cf3f399bedb |
| files | src/testdir/test_vim9_assign.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -740,6 +740,22 @@ def Test_heredoc() CheckDefFailure(['var lines =<< trim END X', 'END'], 'E488:') CheckDefFailure(['var lines =<< trim END " comment', 'END'], 'E488:') + + lines =<< trim [END] + def Func() + var&lines =<< trim END + x + x + x + x + x + x + x + x + enddef + call Func() + [END] + CheckScriptFailure(lines, 'E990:') enddef " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
--- 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 */ /**/ + 1760, +/**/ 1759, /**/ 1758,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4360,7 +4360,7 @@ exarg_getline( for (;;) { - if (cctx->ctx_lnum == cctx->ctx_ufunc->uf_lines.ga_len) + if (cctx->ctx_lnum >= cctx->ctx_ufunc->uf_lines.ga_len - 1) return NULL; ++cctx->ctx_lnum; p = ((char_u **)cctx->ctx_ufunc->uf_lines.ga_data)[cctx->ctx_lnum];