patch 9.1.0062: Internal error when :luado/perldo/pydo etc delete lines

Problem:  Internal error when :luado/perldo/pydo etc delete lines
Solution: Test that the line is still valid line number
          (zeertzjq)

closes: #13931

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/if_lua.c b/src/if_lua.c
index 159a6753e3c0c9ee9016c6fcd1d577d664134c67..4d19c3ef52b00b62fa6568e383d7cdce3f4c9f3a 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -2692,9 +2692,12 @@ ex_luado(exarg_T *eap)
            luaV_emsg(L);
            break;
        }
+
        // Catch the command switching to another buffer.
-       if (curbuf != was_curbuf)
+       // Check the line number, the command may have deleted lines.
+       if (curbuf != was_curbuf || l > curbuf->b_ml.ml_line_count)
            break;
+
        if (lua_isstring(L, -1)) // update line?
        {
 #ifdef HAVE_SANDBOX

diff --git a/src/if_perl.xs b/src/if_perl.xs
index dd504d384b28a0de00ec84fecf73ba5c360b8eac..4f2f8acbda745b5b34c7a0a1115f3a97d2588c56 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -1368,7 +1368,7 @@ ex_perldo(exarg_T *eap)
        PUSHMARK(sp);
        perl_call_pv("VIM::perldo", G_SCALAR | G_EVAL);
        str = SvPV(GvSV(PL_errgv), length);
-       if (length || curbuf != was_curbuf)
+       if (length || curbuf != was_curbuf || i > curbuf->b_ml.ml_line_count)
            break;
        SPAGAIN;
        if (SvTRUEx(POPs))

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 42db5101d8a05541623343aa465e2005a82898ca..3e5993bb64c6abb4d31fd813c811cfc20cf8382d 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -6136,7 +6136,8 @@ run_do(const char *cmd, void *arg UNUSED
            goto err;
 
        // Check that the command didn't switch to another buffer.
-       if (curbuf != was_curbuf)
+       // Check the line number, the command my have deleted lines.
+       if (curbuf != was_curbuf || lnum > curbuf->b_ml.ml_line_count)
        {
            Py_XDECREF(ret);
            goto err;

diff --git a/src/if_ruby.c b/src/if_ruby.c
index 7fab211a8a39a1c445f281ab3ff66dea1968b8a4..a018dcde98b0e49c7bf6bb1b039c27a950e769f6 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -885,7 +885,7 @@ ex_rubydo(exarg_T *eap)
            error_print(state);
            break;
        }
-       if (was_curbuf != curbuf)
+       if (was_curbuf != curbuf || i > curbuf->b_ml.ml_line_count)
            break;
        line = rb_lastline_get();
        if (!NIL_P(line))

diff --git a/src/if_tcl.c b/src/if_tcl.c
index d3d46395ec7436216c8b2baf94fa4fb1d3408b84..eab321bd92f5af735fa9d1a501f8623e9d4cab12 100644 (file)
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -2012,7 +2012,8 @@ ex_tcldo(exarg_T *eap)
 #if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8
            || Tcl_LimitExceeded(tclinfo.interp)
 #endif
-           || curbuf != was_curbuf)
+           || curbuf != was_curbuf
+           || (linenr_T)rs > curbuf->b_ml.ml_line_count)
            break;
        line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0);
        if (line)

diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index 7e727282899ff2542100b16a5d87c132c80d59a6..a99affc04790b27331285f15ba0670884d4929de 100644 (file)
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -28,21 +28,37 @@ func TearDown()
 endfunc
 
 " Check that switching to another buffer does not trigger ml_get error.
-func Test_lua_command_new_no_ml_get_error()
+func Test_lua_luado_change_buffer()
   new
+
   let wincount = winnr('$')
   call setline(1, ['one', 'two', 'three'])
   luado vim.command("new")
   call assert_equal(wincount + 1, winnr('$'))
+
   %bwipe!
 endfunc
 
-" Test vim.command()
-func Test_lua_command()
+" Check that :luado deleting lines does not trigger ml_get error.
+func Test_lua_luado_delete_lines()
   new
+
+  call setline(1, ['one', 'two', 'three'])
+  luado vim.command("%d_")
+  call assert_equal([''], getline(1, '$'))
+
   call setline(1, ['one', 'two', 'three'])
   luado vim.command("1,2d_")
   call assert_equal(['three'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  luado vim.command("2,3d_"); return "REPLACED"
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3luado vim.command("1,2d_"); return "REPLACED"
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 endfunc
 

diff --git a/src/testdir/test_perl.vim b/src/testdir/test_perl.vim
index 681aaae733c281e6d6b37283a5e909c7074063ea..721179c8e5dbfce38fe26902b1d69297f444daec 100644 (file)
--- a/src/testdir/test_perl.vim
+++ b/src/testdir/test_perl.vim
@@ -211,10 +211,25 @@ func Test_perldo()
   call assert_false(search('\Cperl'))
   bw!
 
-  " Check deleting lines does not trigger ml_get error.
   new
+
+  " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
   perldo VIM::DoCommand("%d_")
+  call assert_equal([''], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  perldo VIM::DoCommand("1,2d_")
+  call assert_equal(['three'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  perldo VIM::DoCommand("2,3d_"); $_ = "REPLACED"
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3perldo VIM::DoCommand("1,2d_"); $_ = "REPLACED"
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 
   " Check a Perl expression which gives an error.

diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim
index 066b4bd88f453669f6e9cbfa903ab0e56b4138f9..ac43e6053090efaeaa1405c90ab83501b71f0546 100644 (file)
--- a/src/testdir/test_python2.vim
+++ b/src/testdir/test_python2.vim
@@ -56,10 +56,25 @@ func Test_AAA_python_setup()
 endfunc
 
 func Test_pydo()
-  " Check deleting lines does not trigger an ml_get error.
   new
+
+  " Check deleting lines does not trigger an ml_get error.
   call setline(1, ['one', 'two', 'three'])
   pydo vim.command("%d_")
+  call assert_equal([''], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  pydo vim.command("1,2d_")
+  call assert_equal(['three'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  pydo vim.command("2,3d_"); return "REPLACED"
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3pydo vim.command("1,2d_"); return "REPLACED"
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 
   " Check switching to another buffer does not trigger an ml_get error.

diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index e975cb61b9118575dfe5f1ed1439c1569ad7ac30..7f04f11ab688e245e015e4d68e05305e702d4da6 100644 (file)
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -88,10 +88,25 @@ func Test_AAA_python3_setup()
 endfunc
 
 func Test_py3do()
-  " Check deleting lines does not trigger an ml_get error.
   new
+
+  " Check deleting lines does not trigger an ml_get error.
   call setline(1, ['one', 'two', 'three'])
   py3do vim.command("%d_")
+  call assert_equal([''], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  py3do vim.command("1,2d_")
+  call assert_equal(['three'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  py3do vim.command("2,3d_"); return "REPLACED"
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3py3do vim.command("1,2d_"); return "REPLACED"
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 
   " Check switching to another buffer does not trigger an ml_get error.

diff --git a/src/testdir/test_ruby.vim b/src/testdir/test_ruby.vim
index 2e0835cbe039dc216e2eaa39c8cc9792e080c746..f1551685ca6fe6e2c1d16bc8e3c5acbbaf113683 100644 (file)
--- a/src/testdir/test_ruby.vim
+++ b/src/testdir/test_ruby.vim
@@ -11,10 +11,25 @@ func Test_ruby_change_buffer()
 endfunc
 
 func Test_rubydo()
-  " Check deleting lines does not trigger ml_get error.
   new
+
+  " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
   rubydo Vim.command("%d_")
+  call assert_equal(['one'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("1,2d_")
+  call assert_equal(['one'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("2,3d_"); $_ = "REPLACED"
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3rubydo Vim.command("1,2d_"); $_ = "REPLACED"
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 
   " Check switching to another buffer does not trigger ml_get error.

diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim
index 4c6537fd759872e151528452c964de6317dd412d..68a6d63a50466ad97f356a38c181b2ed87c7e422 100644 (file)
--- a/src/testdir/test_tcl.vim
+++ b/src/testdir/test_tcl.vim
@@ -11,10 +11,25 @@ func TclEval(tcl_expr)
 endfunc
 
 func Test_tcldo()
-  " Check deleting lines does not trigger ml_get error.
   new
+
+  " Check deleting lines does not trigger ml_get error.
   call setline(1, ['one', 'two', 'three'])
   tcldo ::vim::command %d_
+  call assert_equal(['one'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  tcldo ::vim::command 1,2d_
+  call assert_equal(['one'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  tcldo ::vim::command 2,3d_ ; set line REPLACED
+  call assert_equal(['REPLACED'], getline(1, '$'))
+
+  call setline(1, ['one', 'two', 'three'])
+  2,3tcldo ::vim::command 1,2d_ ; set line REPLACED
+  call assert_equal(['three'], getline(1, '$'))
+
   bwipe!
 
   " Check that switching to another buffer does not trigger ml_get error.

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