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/qreg-commands.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/qreg-commands.c')
| -rw-r--r-- | src/qreg-commands.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qreg-commands.c b/src/qreg-commands.c index 41e4465..f8bb4cb 100644 --- a/src/qreg-commands.c +++ b/src/qreg-commands.c @@ -29,6 +29,7 @@ #include "interface.h" #include "ring.h" #include "parser.h" +#include "cmdline.h" #include "core-commands.h" #include "qreg.h" #include "qreg-commands.h" @@ -492,8 +493,11 @@ teco_state_setqregstring_building_initial(teco_machine_main_t *ctx, GError **err /* * The expected codepage of string building constructs is determined * by the Q-Register. + * + * NOTE: This is not safe to undo in macro calls. */ - teco_undo_guint(ctx->expectstring.machine.codepage); + if (ctx == &teco_cmdline.machine) + teco_undo_guint(ctx->expectstring.machine.codepage); return qreg->vtable->get_string(qreg, NULL, NULL, &ctx->expectstring.machine.codepage, error); } |