From 2914a20abc78d4ace94d48d6e6ab9f0da894dd7e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 27 Sep 2020 18:24:03 +0200
Subject: 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 #7031)
---
 src/testdir/test_vim9_assign.vim | 16 ++++++++++++++++
 src/version.c                    |  2 ++
 src/vim9compile.c                |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 0a947346a0..eddc8c5f34 100644
--- 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
diff --git a/src/version.c b/src/version.c
index fe73a92718..7205343fb2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1760,
 /**/
     1759,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d505ca6709..e4f3a906e3 100644
--- 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];
-- 
cgit v1.2.3