ash: parser: Fix parameter expansion inside inner double quotes
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 2 Apr 2018 19:00:59 +0000 (21:00 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Mon, 2 Apr 2018 19:00:59 +0000 (21:00 +0200)
commitf50e14632f7be56da7a38937c887f77812803f70
tree0d657554780661ab752ec04bd8ba56f469b31d63
parentabf755615e5f20c3bbe7534fa29c72fd684ea616
ash: parser: Fix parameter expansion inside inner double quotes

Upstream email:

    parser: Fix parameter expansion inside inner double quotes

    The parsing of parameter expansion inside inner double quotes
    breaks because we never look for ENDVAR while innerdq is true.

            echo "${x#"${x+''}"''}

    This patch fixes it by pushing the syntax stack if innerdq is
    true and we enter a new parameter expansion.

    This patch also fixes a corner case where a bad substitution error
    occurs within arithmetic expansion.

Reported-by: Denys Vlasenko <vda.linux@googlemail.com>
    Fixes: ab1cecb40478 (" parser: Add syntax stack for recursive...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
function                                             old     new   delta
readtoken1                                          2880    2898     +18

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
shell/ash.c
shell/ash_test/ash-quoting/quote_in_varexp1.right [new file with mode: 0644]
shell/ash_test/ash-quoting/quote_in_varexp1.tests [new file with mode: 0755]