patch 8.2.3878: Vim9: debugger tries to read more lines than there are

Problem:    Vim9: debugger tries to read more lines than there are.
Solution:   Check the number of lines. (closes #9394)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index fe985de35c3ca4edf8604227a7e297a26423b194..dcfe8886462f7965ede22fad08d7376b690555c6 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -4731,6 +4731,46 @@ def Run_Test_debug_with_lambda()
   delete('XdebugFunc')
 enddef
 
+func Test_debug_running_out_of_lines()
+  CheckRunVimInTerminal
+
+  " call indirectly to avoid compilation error for missing functions
+  call Run_Test_debug_running_out_of_lines()
+endfunc
+
+def Run_Test_debug_running_out_of_lines()
+  var lines =<< trim END
+      vim9script
+      def Crash()
+          #
+          #
+          #
+          #
+          #
+          #
+          #
+          if true
+              #
+          endif
+      enddef
+      breakadd func Crash
+      Crash()
+  END
+  writefile(lines, 'XdebugFunc')
+  var buf = RunVimInTerminal('-S XdebugFunc', {rows: 6, wait_for_ruler: 0})
+  WaitForAssert(() => assert_match('^>', term_getline(buf, 6)))
+
+  term_sendkeys(buf, "next\<CR>")
+  TermWait(buf)
+  WaitForAssert(() => assert_match('^>', term_getline(buf, 6)))
+
+  term_sendkeys(buf, "cont\<CR>")
+  TermWait(buf)
+
+  StopVimInTerminal(buf)
+  delete('XdebugFunc')
+enddef
+
 def ProfiledWithLambda()
   var n = 3
   echo [[1, 2], [3, 4]]->filter((_, l) => l[0] == n)

diff --git a/src/version.c b/src/version.c
index e310f7675e375bb1c3e29a352f1c78a7ad4953ed..e9d77a92408495ae6d5b5b37146a05977537696f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3878,
 /**/
     3877,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 74851121b22dd99f76d79474af2902b563a0348c..72cbb9044d8aacc7b15c7dcb4063b061ed419b1f 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1660,7 +1660,8 @@ handle_debug(isn_T *iptr, ectx_T *ectx)
     if (end_lnum > iptr->isn_lnum)
     {
        ga_init2(&ga, sizeof(char_u *), 10);
-       for (lnum = iptr->isn_lnum; lnum < end_lnum; ++lnum)
+       for (lnum = iptr->isn_lnum; lnum < end_lnum
+                                    && lnum <= ufunc->uf_lines.ga_len; ++lnum)
        {
            char_u *p = ((char_u **)ufunc->uf_lines.ga_data)[lnum - 1];