summaryrefslogtreecommitdiff
path: root/shell/ash_test
diff options
context:
space:
mode:
authorDenys Vlasenko2018-04-02 21:00:59 +0200
committerDenys Vlasenko2018-04-02 21:00:59 +0200
commitf50e14632f7be56da7a38937c887f77812803f70 (patch)
tree0d657554780661ab752ec04bd8ba56f469b31d63 /shell/ash_test
parentabf755615e5f20c3bbe7534fa29c72fd684ea616 (diff)
downloadbusybox-f50e14632f7be56da7a38937c887f77812803f70.zip
busybox-f50e14632f7be56da7a38937c887f77812803f70.tar.gz
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>
Diffstat (limited to 'shell/ash_test')
-rw-r--r--shell/ash_test/ash-quoting/quote_in_varexp1.right2
-rwxr-xr-xshell/ash_test/ash-quoting/quote_in_varexp1.tests2
2 files changed, 4 insertions, 0 deletions
diff --git a/shell/ash_test/ash-quoting/quote_in_varexp1.right b/shell/ash_test/ash-quoting/quote_in_varexp1.right
new file mode 100644
index 0000000..99a0aea
--- /dev/null
+++ b/shell/ash_test/ash-quoting/quote_in_varexp1.right
@@ -0,0 +1,2 @@
+''
+Ok:0
diff --git a/shell/ash_test/ash-quoting/quote_in_varexp1.tests b/shell/ash_test/ash-quoting/quote_in_varexp1.tests
new file mode 100755
index 0000000..1b97b05
--- /dev/null
+++ b/shell/ash_test/ash-quoting/quote_in_varexp1.tests
@@ -0,0 +1,2 @@
+x="''''"; echo "${x#"${x+''}"''}"
+echo Ok:$?