kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(events): null dereference in autocmd functions

Browse Source
This commit is contained in:
ii14 2023-04-27 22:03:17 +02:00
parent 1cb6040554
commit 774a32e5fe
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/autocmd.c
View File

@ -300,7 +300,7 @@ void aucmd_del_for_event_and_group(event_T event, int group)
AutoCmdVec *const acs = &autocmds[(int)event]; AutoCmdVec *const acs = &autocmds[(int)event];
for (size_t i = 0; i < kv_size(*acs); i++) { for (size_t i = 0; i < kv_size(*acs); i++) {
AutoCmd *const ac = &kv_A(*acs, i); AutoCmd *const ac = &kv_A(*acs, i);
if (ac->pat->group == group) { if (ac->pat != NULL && ac->pat->group == group) {
aucmd_del(ac); aucmd_del(ac);
} }
} }
@ -2027,6 +2027,7 @@ char *getnextac(int c, void *cookie, int indent, bool do_concat)
assert(apc->auidx < kv_size(*acs)); assert(apc->auidx < kv_size(*acs));
AutoCmd *const ac = &kv_A(*acs, apc->auidx); AutoCmd *const ac = &kv_A(*acs, apc->auidx);
assert(ac->pat != NULL);
bool oneshot = ac->once; bool oneshot = ac->once;
if (p_verbose >= 9) { if (p_verbose >= 9) {
@ -2288,7 +2289,8 @@ bool au_exists(const char *const arg)
AutoPat *const ap = kv_A(*acs, i).pat; AutoPat *const ap = kv_A(*acs, i).pat;
// Only use a pattern when it has not been removed. // Only use a pattern when it has not been removed.
// For buffer-local autocommands, path_fnamecmp() works fine. // For buffer-local autocommands, path_fnamecmp() works fine.
if ((group == AUGROUP_ALL || ap->group == group) if (ap != NULL
&& (group == AUGROUP_ALL || ap->group == group)
&& (pattern == NULL && (pattern == NULL
|| (buflocal_buf == NULL || (buflocal_buf == NULL
? path_fnamecmp(ap->pat, pattern) == 0 ? path_fnamecmp(ap->pat, pattern) == 0

16
test/functional/autocmd/autocmd_spec.lua
View File

@ -629,4 +629,20 @@ describe('autocmd', function()
]] ]]
eq(1, eval('g:count')) -- Added autocommands should not be executed eq(1, eval('g:count')) -- Added autocommands should not be executed
end) end)
it('no crash when clearing a group inside a callback #23355', function()
exec_lua [[
vim.cmd "autocmd! TabNew"
local group = vim.api.nvim_create_augroup('Test', {})
local id
id = vim.api.nvim_create_autocmd('TabNew', {
group = group,
callback = function()
vim.api.nvim_del_autocmd(id)
vim.api.nvim_create_augroup('Test', { clear = true })
end,
})
vim.cmd "tabnew"
]]
end)
end) end)