diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-10-15 23:33:43 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-10-15 23:33:43 +0300 |
| commit | d556aee67e615b48c25861741d28d103109235e3 (patch) | |
| tree | 46c30b4c420c1f50cdc8b4e10a1e13e440eb1c01 /src/search.c | |
| parent | 7413b9cab2690f7bed6d82e903b0fc08b1590360 (diff) | |
| download | sciteco-d556aee67e615b48c25861741d28d103109235e3.tar.gz | |
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.
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/search.c b/src/search.c index db85283..22dc726 100644 --- a/src/search.c +++ b/src/search.c @@ -35,6 +35,7 @@ #include "parser.h" #include "core-commands.h" #include "error.h" +#include "cmdline.h" #include "search.h" typedef struct { @@ -60,7 +61,12 @@ teco_state_search_initial(teco_machine_main_t *ctx, GError **error) if (ctx->mode > TECO_MODE_NORMAL) return TRUE; - teco_undo_guint(ctx->expectstring.machine.codepage) = teco_interface_get_codepage(); + /* + * 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_interface_get_codepage(); if (G_UNLIKELY(!teco_search_qreg_machine)) teco_search_qreg_machine = teco_machine_qregspec_new(TECO_QREG_REQUIRED, ctx->qreg_table_locals, @@ -1046,8 +1052,15 @@ TECO_DEFINE_STATE_SEARCH(teco_state_search_delete); static gboolean teco_state_replace_insert_initial(teco_machine_main_t *ctx, GError **error) { - if (ctx->mode == TECO_MODE_NORMAL) - teco_undo_guint(ctx->expectstring.machine.codepage) = teco_interface_get_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_interface_get_codepage(); return TRUE; } |