Mercurial > vim

changeset 20972:d561e3c6cd65 v8.2.1037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1037: Vim9: crash when using line continuation inside :def Commit: https://github.com/vim/vim/commit/acd4c5e914f8a06745624ba585f3d06d5faf4ddd Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Mon, 22 Jun 2020 19:45:03 +0200
parents d906d18f4ffb
children 98123dbc498a
files src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,
--- 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;
     }