dash.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Youfu Zhang <zhangyoufu@gmail.com>
To: Harald van Dijk <harald@gigawatt.nl>
Cc: dash@vger.kernel.org
Subject: Re: [PATCH] [BUILTIN] describe_command: fix incorrect path
Date: Fri, 26 May 2017 22:47:50 +0800	[thread overview]
Message-ID: <CAEKhA2xgjEsag=RTmMxCCy9usyc_W6u0ZoZ9YXpAP9D9yL0DBA@mail.gmail.com> (raw)
In-Reply-To: <e4514426-2098-72b9-d1bb-eb5364607aef@gigawatt.nl>

Your patch looks better than mine :)

Please consider post this patch to busybox as well.
Their ash has same code and same issue.

See http://lists.busybox.net/pipermail/busybox/2017-May/085459.html

On Fri, May 26, 2017 at 3:59 PM, Harald van Dijk <harald@gigawatt.nl> wrote:
> Hi,
>
> On 26/05/17 09:04, Youfu Zhang wrote:
>>
>> $ PATH=/extra/path:/usr/sbin:/usr/bin:/sbin:/bin \
>>>
>>> sh -xc 'command -V ls; command -V ls; command -Vp ls; command -vp ls'
>>
>> + command -V ls
>> ls is /bin/ls
>> + command -V ls
>> ls is a tracked alias for /bin/ls
>> + command -Vp ls
>> ls is a tracked alias for (null)
>> + command -vp ls
>> Segmentation fault (core dumped)
>>
>> describe_command should respect `path' argument. Looking up in the hash
>> table
>> may gives incorrect index in entry.u.index and finally causes incorrect
>> output
>> or SIGSEGV.
>
>
> True, but only when a path is passed in. If the default path is used,
> looking up in the hash table is correct, and printing tracked aliases is
> intentional.
>
> If it's desirable to drop that feature, then it should be dropped
> completely, code shouldn't be left in that can no longer be used. But it's
> possible to keep it working: how about this instead?
>
> Signed-off-by: Harald van Dijk <harald@gigawatt.nl>
> ---
>  src/exec.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/src/exec.c b/src/exec.c
> index ec0eadd..1350da3 100644
> --- a/src/exec.c
> +++ b/src/exec.c
> @@ -743,8 +743,6 @@ describe_command(out, command, path, verbose)
>         struct tblentry *cmdp;
>         const struct alias *ap;
>
> -       path = path ?: pathval();
> -
>         if (verbose) {
>                 outstr(command, out);
>         }
> @@ -767,8 +765,15 @@ describe_command(out, command, path, verbose)
>                 goto out;
>         }
>
> -       /* Then check if it is a tracked alias */
> -       if ((cmdp = cmdlookup(command, 0)) != NULL) {
> +       /* Then if the standard search path is used, check if it is a
> tracked alias.  */
> +       if (path == NULL) {
> +               path = pathval();
> +               cmdp = cmdlookup(command, 0);
> +       } else {
> +               cmdp = NULL;
> +       }
> +
> +       if (cmdp != NULL) {
>                 entry.cmdtype = cmdp->cmdtype;
>                 entry.u = cmdp->param;
>         } else {

      reply	other threads:[~2017-05-26 14:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-26  7:04 Youfu Zhang
2017-05-26  7:59 ` Harald van Dijk
2017-05-26 14:47   ` Youfu Zhang [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='CAEKhA2xgjEsag=RTmMxCCy9usyc_W6u0ZoZ9YXpAP9D9yL0DBA@mail.gmail.com' \
    --to=zhangyoufu@gmail.com \
    --cc=dash@vger.kernel.org \
    --cc=harald@gigawatt.nl \
    --subject='Re: [PATCH] [BUILTIN] describe_command: fix incorrect path' \
    /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

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).