From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-workers@zsh.org
Subject: Re: "double free or corruption (out)" in zsh correct
Date: Wed, 21 Jul 2021 21:18:51 +0100 [thread overview]
Message-ID: <ba5247265ea5f89f54dab3f18c9b7b2bbe3557a2.camel@ntlworld.com> (raw)
In-Reply-To: <CAH+w=7ZASsGeN6xg2CGMXhrXoDN9ck624ex3mXhtmvKjVQpXRw@mail.gmail.com>
On Wed, 2021-07-21 at 10:03 -0700, Bart Schaefer wrote:
> On Wed, Jul 21, 2021 at 6:03 AM Henning Reich <henning.reich@gmail.com> wrote:
> >
> > you probably already know but it seems there is a bug in the correct
> > function (or is this not part of zsh?).
>
> I can reproduce:
>
> ubuntu% setopt correct
> ubuntu% A=$(PWD)
> zsh: correct 'PWD' to 'pwd' [nyae]? y
> hist.c:1710: BUG: hwget() called in middle of word
> zsh: segmentation fault (core dumped) Src/zsh -f
We don't currently have the tools to do the history replacement within the
recursive analysis of the $(...), which doesn't maintain history with all
the detail of the main command line. It's probably better just to turn
it off there for now. This means the word seen is A=$(PWD) so it
doesn't get corrected. Anything more is more work.
pws
diff --git a/Src/hist.c b/Src/hist.c
index 42cae030c..6ac581fda 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -339,6 +339,13 @@ hist_in_word(int yesno)
histactive &= ~HA_INWORD;
}
+/**/
+int
+hist_is_in_word(void)
+{
+ return (histactive & HA_INWORD) ? 1 : 0;
+}
+
/* add a character to the current history word */
static void
diff --git a/Src/lex.c b/Src/lex.c
index 37fcec3e2..ece02659e 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1889,6 +1889,7 @@ exalias(void)
hwend();
if (interact && isset(SHINSTDIN) && !strin && incasepat <= 0 &&
tok == STRING && !nocorrect && !(inbufflags & INP_ALIAS) &&
+ !hist_is_in_word() &&
(isset(CORRECTALL) || (isset(CORRECT) && incmdpos)))
spckword(&tokstr, 1, incmdpos, 1);
prev parent reply other threads:[~2021-07-21 20:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 13:01 Henning Reich
2021-07-21 17:03 ` Bart Schaefer
2021-07-21 20:18 ` Peter Stephenson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ba5247265ea5f89f54dab3f18c9b7b2bbe3557a2.camel@ntlworld.com \
--to=p.w.stephenson@ntlworld.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).