diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-01-29 19:32:39 +0100 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-01-29 19:32:39 +0100 |
commit | e99f0688785c3d56b1ee45a28fa6ce02b850a33b (patch) | |
tree | af86efdd7f5addf6e142e5f40712877429a60dff /src | |
parent | e6d8b4662ddf9356da53f56e363b67b524fd8825 (diff) |
patch 9.1.0062: Internal error when :luado/perldo/pydo etc delete linesv9.1.0062
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/if_lua.c | 5 | ||||
-rw-r--r-- | src/if_perl.xs | 2 | ||||
-rw-r--r-- | src/if_py_both.h | 3 | ||||
-rw-r--r-- | src/if_ruby.c | 2 | ||||
-rw-r--r-- | src/if_tcl.c | 3 | ||||
-rw-r--r-- | src/testdir/test_lua.vim | 22 | ||||
-rw-r--r-- | src/testdir/test_perl.vim | 17 | ||||
-rw-r--r-- | src/testdir/test_python2.vim | 17 | ||||
-rw-r--r-- | src/testdir/test_python3.vim | 17 | ||||
-rw-r--r-- | src/testdir/test_ruby.vim | 17 | ||||
-rw-r--r-- | src/testdir/test_tcl.vim | 17 | ||||
-rw-r--r-- | src/version.c | 2 |
12 files changed, 111 insertions, 13 deletions
diff --git a/src/if_lua.c b/src/if_lua.c index 159a6753e3..4d19c3ef52 100644 --- 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 dd504d384b..4f2f8acbda 100644 --- 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 42db5101d8..3e5993bb64 100644 --- 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 7fab211a8a..a018dcde98 100644 --- 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 d3d46395ec..eab321bd92 100644 --- 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 7e72728289..a99affc047 100644 --- 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 681aaae733..721179c8e5 100644 --- 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 066b4bd88f..ac43e60530 100644 --- 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 e975cb61b9..7f04f11ab6 100644 --- 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 2e0835cbe0..f1551685ca 100644 --- 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 4c6537fd75..68a6d63a50 100644 --- 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 749a918fb6..e9917e18f4 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 62, +/**/ 61, /**/ 60, |