From d556aee67e615b48c25861741d28d103109235e3 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 15 Oct 2024 23:33:43 +0300 Subject: fixed memory corruptions due to undoing the teco_machine_stringbuilding_t::codepage * It's contained in teco_machine_main_t which is created per macro call frame. So after macro calls, the machine no longer exists. It is therefore unsafe to undo its members indiscriminately. * On the other hand, we must undo the codepage setting when run interactively, so it is now only undone when belonging to the commandline macro frame. * This was actually causing memory corruptions on every fnkeys cursor movement, but never caused crashes - probably because the invalid pointers are always pointing to unused parts of the C call stack. * Initially broken in b31b8871. --- src/parser.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/parser.c') diff --git a/src/parser.c b/src/parser.c index 8cb26e7..4e42833 100644 --- a/src/parser.c +++ b/src/parser.c @@ -35,6 +35,7 @@ #include "ring.h" #include "glob.h" #include "error.h" +#include "cmdline.h" #include "core-commands.h" #include "goto-commands.h" #include "parser.h" @@ -906,8 +907,15 @@ teco_machine_stringbuilding_clear(teco_machine_stringbuilding_t *ctx) gboolean teco_state_expectstring_initial(teco_machine_main_t *ctx, GError **error) { - if (ctx->mode == TECO_MODE_NORMAL) - teco_undo_guint(ctx->expectstring.machine.codepage) = teco_default_codepage(); + if (ctx->mode > TECO_MODE_NORMAL) + return TRUE; + + /* + * NOTE: This is not safe to undo in macro calls. + */ + if (ctx == &teco_cmdline.machine) + teco_undo_guint(ctx->expectstring.machine.codepage); + ctx->expectstring.machine.codepage = teco_default_codepage(); return TRUE; } -- cgit v1.2.3