aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Vicentin <42344207+Vinschers@users.noreply.github.com>2025-02-02 01:25:38 +0100
committerGitHub <noreply@github.com>2025-02-01 16:25:38 -0800
commit289c9d21cb91ec6c47496230ca49eef42a04250c (patch)
tree7110c7195711618021eca8d9da96e97b4426f109 /src
parent0985e784d8dce58748343207e176bf61303b7d68 (diff)
downloadrneovim-289c9d21cb91ec6c47496230ca49eef42a04250c.tar.gz
rneovim-289c9d21cb91ec6c47496230ca49eef42a04250c.tar.bz2
rneovim-289c9d21cb91ec6c47496230ca49eef42a04250c.zip
fix(autocmds): once=true Lua event-handler may call itself #29544
Problem: Event handler declared with `once=true` can re-trigger itself (i.e. more than once!) by calling `nvim_exec_autocmds` or `:doautocmd`. Analysis: This happens because the callback is executed before deletion/cleanup (`aucmd_del`). And calling `aucmd_del` before `call_autocmd_callback` breaks the autocmd execution... Solution: Set `ac->pat=NULL` to temporarily "delete" the autocmd, then restore it after executing the callback. Fix #25526 Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/nvim/autocmd.c38
1 files changed, 25 insertions, 13 deletions
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index eb7c8c2880..6a7cf1c9a3 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -2025,7 +2025,8 @@ static void aucmd_next(AutoPatCmd *apc)
apc->auidx = SIZE_MAX;
}
-static bool call_autocmd_callback(const AutoCmd *ac, const AutoPatCmd *apc)
+/// Executes an autocmd callback function (as opposed to an Ex command).
+static bool au_callback(const AutoCmd *ac, const AutoPatCmd *apc)
{
Callback callback = ac->exec.callable.cb;
if (callback.type == kCallbackLua) {
@@ -2106,16 +2107,24 @@ char *getnextac(int c, void *cookie, int indent, bool do_concat)
apc->script_ctx = current_sctx;
char *retval;
- if (ac->exec.type == CALLABLE_CB) {
- // Can potentially reallocate kvec_t data and invalidate the ac pointer
- if (call_autocmd_callback(ac, apc)) {
- // If an autocommand callback returns true, delete the autocommand
- oneshot = true;
- }
-
- // TODO(tjdevries):
- //
- // Major Hack Alert:
+ switch (ac->exec.type) {
+ case CALLABLE_EX:
+ retval = xstrdup(ac->exec.callable.cmd);
+ break;
+ case CALLABLE_CB: {
+ AutoCmd ac_copy = *ac;
+ // Mark oneshot handler as "removed" now, to prevent recursion by e.g. `:doautocmd`. #25526
+ ac->pat = oneshot ? NULL : ac->pat;
+ // May reallocate `acs` kvec_t data and invalidate the `ac` pointer.
+ bool rv = au_callback(&ac_copy, apc);
+ if (oneshot) {
+ // Restore `pat`. Use `acs` because `ac` may have been invalidated by the callback.
+ kv_A(*acs, apc->auidx).pat = ac_copy.pat;
+ }
+ // If an autocommand callback returns true, delete the autocommand
+ oneshot = oneshot || rv;
+
+ // HACK(tjdevries):
// We just return "not-null" and continue going.
// This would be a good candidate for a refactor. You would need to refactor:
// 1. do_cmdline to accept something besides a string
@@ -2124,8 +2133,11 @@ char *getnextac(int c, void *cookie, int indent, bool do_concat)
// and instead we loop over all the matches and just execute one-by-one.
// However, my expectation would be that could be expensive.
retval = xcalloc(1, 1);
- } else {
- retval = xstrdup(ac->exec.callable.cmd);
+ break;
+ }
+ case CALLABLE_NONE:
+ default:
+ abort();
}
// Remove one-shot ("once") autocmd in anticipation of its execution.