patch 9.0.0871: using freed memory when clearing augroup at more prompt
Problem: Using freed memory when clearing augroup at more prompt.
Solution: Delay clearing augroup until it's safe. (closes #11441)
diff --git a/src/autocmd.c b/src/autocmd.c
index cf0f094..8a0992c 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -296,9 +296,14 @@
if (ap->pat == NULL) // pattern has been removed
return;
+ // Make sure no info referenced by "ap" is cleared, e.g. when a timer
+ // clears an augroup. Jump to "theend" after this!
+ // "ap->pat" may be cleared anyway.
+ ++autocmd_busy;
+
msg_putchar('\n');
if (got_int)
- return;
+ goto theend;
if (event != last_event || ap->group != last_group)
{
if (ap->group != AUGROUP_DEFAULT)
@@ -314,8 +319,12 @@
last_group = ap->group;
msg_putchar('\n');
if (got_int)
- return;
+ goto theend;
}
+
+ if (ap->pat == NULL)
+ goto theend; // timer might have cleared the pattern or group
+
msg_col = 4;
msg_outtrans(ap->pat);
@@ -328,21 +337,24 @@
msg_putchar('\n');
msg_col = 14;
if (got_int)
- return;
+ goto theend;
msg_outtrans(ac->cmd);
#ifdef FEAT_EVAL
if (p_verbose > 0)
last_set_msg(ac->script_ctx);
#endif
if (got_int)
- return;
+ goto theend;
if (ac->next != NULL)
{
msg_putchar('\n');
if (got_int)
- return;
+ goto theend;
}
}
+
+theend:
+ --autocmd_busy;
}
/*