# HG changeset patch # User Bram Moolenaar # Date 1592847903 -7200 # Node ID d561e3c6cd658f9e83b853f79a4cab85fa1fac9a # Parent d906d18f4ffb49603c61b08e9da571e33f03b973 patch 8.2.1037: Vim9: crash when using line continuation inside :def Commit: https://github.com/vim/vim/commit/acd4c5e914f8a06745624ba585f3d06d5faf4ddd Author: Bram Moolenaar Date: Mon Jun 22 19:39:03 2020 +0200 patch 8.2.1037: Vim9: crash when using line continuation inside :def Problem: Vim9: crash when using line continuation inside :def. Solution: Check for no more lines available. diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -837,5 +837,16 @@ def Test_sort_return_type() res = [1, 2, 3]->sort() enddef +def Line_continuation_in_def(dir: string = ''): string + let path: string = empty(dir) + \ ? 'empty' + \ : 'full' + return path +enddef + +def Test_line_continuation_in_def() + assert_equal('full', Line_continuation_in_def('.')) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1037, +/**/ 1036, /**/ 1035, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2402,8 +2402,11 @@ peek_next_line(cctx_T *cctx) while (++lnum < cctx->ctx_ufunc->uf_lines.ga_len) { char_u *line = ((char_u **)cctx->ctx_ufunc->uf_lines.ga_data)[lnum]; - char_u *p = skipwhite(line); - + char_u *p; + + if (line == NULL) + break; + p = skipwhite(line); if (*p != NUL && !comment_start(p)) return p; }