From: Bart Schaefer <schaefer@brasslantern.com>
To: "Raphaël Jakse" <raphael.jakse@imag.fr>
Cc: "zsh-workers@zsh.org" <zsh-workers@zsh.org>
Subject: Re: [PATCH] Fix #87 - Segfault fault when autocompleting after ">" in, "!> ."
Date: Mon, 28 Nov 2016 08:23:42 -0800 [thread overview]
Message-ID: <CAH+w=7YCakLhUuDWX+TjzOF_3utqmODhyOKyXft9zXfc8MD-CQ@mail.gmail.com> (raw)
In-Reply-To: <53d2b131-bca8-b968-bf46-fa4e4d801231@imag.fr>
On Mon, Nov 28, 2016 at 5:06 AM, Raphaël Jakse <raphael.jakse@imag.fr> wrote:
>
> Here is a patch that works around this bug by checking whether s is null in
> the get_comp_string function (zle_tricky.c) before a code that seems to
> assume that s is not null.
Thanks for calling our attention to this.
The actual problem seems to be that the code assumed ztrdup(NULL)
would return empty string, when in fact it returns NULL:
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index c8d3bb3..d636373 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1464,7 +1464,10 @@ get_comp_string(void)
t0 = STRING;
} else if (t0 == STRING || t0 == TYPESET) {
/* We found a simple string. */
- s = ztrdup(clwords[clwpos]);
+ if (clwords[clwpos])
+ s = ztrdup(clwords[clwpos]);
+ else
+ s = ztrdup("");
} else if (t0 == ENVSTRING) {
char sav;
/* The cursor was inside a parameter assignment. */
The reason "we found a simple string" is because the completion system
inserts a phantom "x" at the cursor to be sure it can split the
current word into before/after substrings, so the parser is actually
handed "!>x" and asked for the token at "x". The "x" is then removed
again, and clwpos (command line word position) ends up pointing at the
null terminator of the clwords array.
> It is unclear to me how to send a patch for zsh so please let me know if
> something is wrong or if additional steps are necessary to apply this patch.
What you did is fine, though we prefer that the attachment be of type
"text/plain" (which usually means you should not use ".patch" or
".diff" as the file name extension).
next prev parent reply other threads:[~2016-11-28 17:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161128134346epcas3p4381b0fc59bb5d7513c81239ac4d11034@epcas3p4.samsung.com>
2016-11-28 13:06 ` Raphaël Jakse
2016-11-28 16:23 ` Bart Schaefer [this message]
2016-11-28 16:57 ` Peter Stephenson
2016-12-09 16:42 ` Raphaël Jakse
2016-12-09 17:22 ` Peter Stephenson
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='CAH+w=7YCakLhUuDWX+TjzOF_3utqmODhyOKyXft9zXfc8MD-CQ@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=raphael.jakse@imag.fr \
--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).