From: Herbert Xu <herbert@gondor.apana.org.au>
To: Simon Ser <contact@emersion.fr>
Cc: "dash@vger.kernel.org" <dash@vger.kernel.org>
Subject: [PATCH] parser: Catch errors in expandstr
Date: Tue, 21 Jan 2020 14:39:59 +0800 [thread overview]
Message-ID: <20200121063959.tel7ty76fkz33xpn@gondor.apana.org.au> (raw)
In-Reply-To: <SJhI_AW9YJmphaap5RzzVqYTGsA529iV7GOEBafT9ilDPGFpMRRJlNt3TrMBwh0uqKQltSvsH2P8x_2in6enHT5DzygjAtrRSvWl5xHofeY=@emersion.fr>
On Fri, Dec 13, 2019 at 02:51:34PM +0000, Simon Ser wrote:
> Just noticed another dash bug: when setting invalid PS1 values dash
> enters an infinite loop.
>
> For instance, setting PS1='$(' makes dash print many of these:
>
> dash: 1: Syntax error: end of file unexpected (expecting ")")
>
> It would be nice to fallback to the default PS1 value on error.
This patch fixes it by using the literal value of PS1 should an
error occur during expansion.
Reported-by: Simon Ser <contact@emersion.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/src/parser.c b/src/parser.c
index b318b08..201d5bd 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1571,28 +1571,43 @@ setprompt(int which)
const char *
expandstr(const char *ps)
{
+ struct jmploc *volatile savehandler;
+ const char *volatile result;
+ volatile int saveprompt;
+ struct jmploc jmploc;
union node n;
- int saveprompt;
+ int err;
/* XXX Fix (char *) cast. */
setinputstring((char *)ps);
saveprompt = doprompt;
doprompt = 0;
+ result = ps;
+ savehandler = handler;
+ if (unlikely(err = setjmp(jmploc.loc)))
+ goto out;
+ handler = &jmploc;
readtoken1(pgetc_eatbnl(), DQSYNTAX, FAKEEOFMARK, 0);
- doprompt = saveprompt;
-
- popfile();
-
n.narg.type = NARG;
n.narg.next = NULL;
n.narg.text = wordtext;
n.narg.backquote = backquotelist;
expandarg(&n, NULL, EXP_QUOTED);
- return stackblock();
+ result = stackblock();
+
+out:
+ handler = savehandler;
+ if (err && exception != EXERROR)
+ longjmp(handler->loc, 1);
+
+ doprompt = saveprompt;
+ popfile();
+
+ return result;
}
/*
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next parent reply other threads:[~2020-01-21 6:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <SJhI_AW9YJmphaap5RzzVqYTGsA529iV7GOEBafT9ilDPGFpMRRJlNt3TrMBwh0uqKQltSvsH2P8x_2in6enHT5DzygjAtrRSvWl5xHofeY=@emersion.fr>
2020-01-21 6:39 ` Herbert Xu [this message]
2020-01-21 17:06 ` [PATCH] parser: Catch errors in expandstr Simon Ser
2020-02-26 21:12 ` Ron Yorston
2020-02-28 0:40 ` Herbert Xu
2020-04-28 6:17 ` [v2 PATCH] " Herbert Xu
2020-05-17 12:19 ` Harald van Dijk
2020-05-17 13:36 ` [PATCH] parser: Save and restore heredoclist " Herbert Xu
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=20200121063959.tel7ty76fkz33xpn@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=contact@emersion.fr \
--cc=dash@vger.kernel.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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).