From a3c6c5513dcfc25d952735449bf6da476d905184 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 18 Mar 2020 19:57:49 +0000 Subject: 45583/0007: WC_FUNCDEF: Add a placeholder element. --- Src/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Src/text.c') diff --git a/Src/text.c b/Src/text.c index 69530ae79..4bf88f2e2 100644 --- a/Src/text.c +++ b/Src/text.c @@ -600,7 +600,7 @@ gettext2(Estate state) n->u._funcdef.end = end; n->u._funcdef.nargs = nargs; state->strs += *state->pc; - state->pc += 3; + state->pc += 4; } } else { state->strs = s->u._funcdef.strs; -- cgit v1.2.3 From d165d408a088a432cae04b86c5bc312de3cc3acb Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Mon, 6 Sep 2021 13:55:44 -0700 Subject: 49266: fix segfault on metacharacters in long job texts --- ChangeLog | 2 ++ Src/text.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'Src/text.c') diff --git a/ChangeLog b/ChangeLog index ce40f65e0..c8060d55f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2021-09-06 Bart Schaefer + * 49266: fix segfault on metacharacters in long job texts + * Marlon Richert: 49218: Functions/Misc/run-help, Functions/Misc/run-help-btrfs, Functions/Misc/run-help-git, Functions/Misc/run-help-ip, Functions/Misc/run-help-p4, diff --git a/Src/text.c b/Src/text.c index 4bf88f2e2..5cd7685fd 100644 --- a/Src/text.c +++ b/Src/text.c @@ -335,6 +335,8 @@ getjobtext(Eprog prog, Wordcode c) tlim = tptr + JOBTEXTSIZE - 1; tjob = 1; gettext2(&s); + if (tptr[-1] == Meta) + --tptr; *tptr = '\0'; freeeprog(prog); /* mark as unused */ untokenize(jbuf); -- cgit v1.2.3