Mercurial > vim
diff src/if_lua.c @ 10757:6c3d42d18366 v8.0.0268
patch 8.0.0268: may get ml_get error when :luado deletes lines
commit https://github.com/vim/vim/commit/d58f03b1c21b5b0242718f89da53ddd67b1eff6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 29 22:48:45 2017 +0100
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 https://github.com/vim/vim/issues/1421)
Solution: Check the buffer and line every time.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 29 Jan 2017 23:00:04 +0100 |
| parents | 068f397d0da4 |
| children | 68d7bc045dbe |
line wrap: on
line diff
--- 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