diff options
| author | RZia <36330543+grassdne@users.noreply.github.com> | 2022-10-09 20:04:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 08:04:08 +0800 |
| commit | a5597d1fc066a8512ce9434dbff70850dc7bd5a1 (patch) | |
| tree | c3f1f1cf174c8b67e4be41ee8a781734fadcc4ec | |
| parent | 9d0ed754d5a8e6b442e1da2a153422dcee9004e1 (diff) | |
| download | rneovim-a5597d1fc066a8512ce9434dbff70850dc7bd5a1.tar.gz rneovim-a5597d1fc066a8512ce9434dbff70850dc7bd5a1.tar.bz2 rneovim-a5597d1fc066a8512ce9434dbff70850dc7bd5a1.zip | |
fix(lua): assert failure with vim.regex() error inside :silent! (#20555)
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| -rw-r--r-- | src/nvim/lua/stdlib.c | 4 | ||||
| -rw-r--r-- | test/functional/lua/vim_spec.lua | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c index 498f956ed9..2f46f6ff65 100644 --- a/src/nvim/lua/stdlib.c +++ b/src/nvim/lua/stdlib.c @@ -304,8 +304,10 @@ int nlua_regex(lua_State *lstate) nlua_push_errstr(lstate, "couldn't parse regex: %s", err.msg); api_clear_error(&err); return lua_error(lstate); + } else if (prog == NULL) { + nlua_push_errstr(lstate, "couldn't parse regex"); + return lua_error(lstate); } - assert(prog); regprog_T **p = lua_newuserdata(lstate, sizeof(regprog_T *)); *p = prog; diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua index 6451453ce0..47a0004183 100644 --- a/test/functional/lua/vim_spec.lua +++ b/test/functional/lua/vim_spec.lua @@ -24,6 +24,7 @@ local rmdir = helpers.rmdir local write_file = helpers.write_file local expect_exit = helpers.expect_exit local poke_eventloop = helpers.poke_eventloop +local assert_alive = helpers.assert_alive describe('lua stdlib', function() before_each(clear) @@ -2210,6 +2211,10 @@ describe('lua stdlib', function() eq({3,7}, exec_lua[[return {re1:match_line(0, 1, 1, 8)}]]) eq({}, exec_lua[[return {re1:match_line(0, 1, 1, 7)}]]) eq({0,3}, exec_lua[[return {re1:match_line(0, 1, 0, 7)}]]) + + -- vim.regex() error inside :silent! should not crash. #20546 + command([[silent! lua vim.regex('\\z')]]) + assert_alive() end) it('vim.defer_fn', function() |