patch 8.0.0268: may get ml_get error when :luado deletes lines

Problem:    May get ml_get error when :luado deletes lines or switches to
            another buffer. (Nikolai Pavlov, issue #1421)
Solution:   Check the buffer and line every time.

diff --git a/src/Makefile b/src/Makefile
index 76170ec36bf2e37ca03e8c408bf26b92653384b1..f26a1bf33c043b6754237f4232c3de96d0e742ef 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2147,6 +2147,7 @@ test_arglist \
        test_langmap \
        test_largefile \
        test_lispwords \
+       test_lua \
        test_man \
        test_mapping \
        test_marks \

diff --git a/src/if_lua.c b/src/if_lua.c
index b77a3cd5dd97db26bd0e42f48a917f7283d34a5d..ad8ee1bf0c4de94747a061f16ee4716024b54408 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -1716,6 +1716,8 @@ ex_luado(exarg_T *eap)
     const char *s = (const char *) eap->arg;
     luaL_Buffer b;
     size_t len;
+    buf_T *was_curbuf = curbuf;
+
     if (lua_init() == FAIL) return;
     if (u_save(eap->line1 - 1, eap->line2 + 1) == FAIL)
     {
@@ -1739,6 +1741,10 @@ ex_luado(exarg_T *eap)
     lua_replace(L, -2); /* function -> body */
     for (l = eap->line1; l <= eap->line2; l++)
     {
+       /* Check the line number, the command my have deleted lines. */
+       if (l > curbuf->b_ml.ml_line_count)
+           break;
+
        lua_pushvalue(L, -1); /* function */
        luaV_pushline(L, curbuf, l); /* current line as arg */
        lua_pushinteger(L, l); /* current line number as arg */
@@ -1747,6 +1753,9 @@ ex_luado(exarg_T *eap)
            luaV_emsg(L);
            break;
        }
+       /* Catch the command switching to another buffer. */
+       if (curbuf != was_curbuf)
+           break;
        if (lua_isstring(L, -1)) /* update line? */
        {
 #ifdef HAVE_SANDBOX

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index c01634cc0c50791faa2b0ebf91daf4d37d531155..bb646ee1b01b4c773f363c97d535aa197ad2545e 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -164,6 +164,7 @@ NEW_TESTS = test_arglist.res \
            test_job_fails.res \
            test_json.res \
            test_langmap.res \
+           test_lua.res \
            test_man.res \
            test_marks.res \
            test_matchadd_conceal.res \
@@ -172,8 +173,8 @@ NEW_TESTS = test_arglist.res \
            test_nested_function.res \
            test_netbeans.res \
            test_normal.res \
-           test_paste.res \
            test_packadd.res \
+           test_paste.res \
            test_perl.res \
            test_profile.res \
            test_python2.res \

diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
new file mode 100644 (file)
index 0000000..944ad90
--- /dev/null
+++ b/src/testdir/test_lua.vim
@@ -0,0 +1,22 @@
+" Tests for Lua.
+" TODO: move tests from test85.in here.
+
+if !has('lua')
+  finish
+endif
+
+func Test_luado()
+  new
+  call setline(1, ['one', 'two', 'three'])
+  luado vim.command("%d_")
+  bwipe!
+
+  " Check switching to another buffer does not trigger ml_get error.
+  new
+  let wincount = winnr('$')
+  call setline(1, ['one', 'two', 'three'])
+  luado vim.command("new")
+  call assert_equal(wincount + 1, winnr('$'))
+  bwipe!
+  bwipe!
+endfunc

diff --git a/src/version.c b/src/version.c
index 0b12b2a0b36a5b41a65772a3764a52540c0c0703..9788d6527b6254ff2213f9c3b510dd617fbf7585 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    268,
 /**/
     267,
 /**/