emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix error during recursive processing of here document

Browse Source 
Save the value of the checkkwd flag to prevent it being clobbered
during recursion.

Based on commit ec2c84d from git://git.kernel.org/pub/scm/utils/dash/dash.git
by Herbert Xu.

function                                             old     new   delta
readtoken                                            190     203     +13
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 13/0)               Total: 13 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2015-10-29 16:44:56 +00:00 committed by Denys Vlasenko
parent 7b14ede049
commit 713f07d906
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shell/ash.c
View File

@ -11899,6 +11899,7 @@ static int
readtoken(void)
{
int t;
int kwd = checkkwd;
#if DEBUG
smallint alreadyseen = tokpushback;
#endif
@ -11912,7 +11913,7 @@ readtoken(void)
/*
* eat newlines
*/
if (checkkwd & CHKNL) {
if (kwd & CHKNL) {
while (t == TNL) {
parseheredoc();
t = xxreadtoken();
@ -11926,7 +11927,7 @@ readtoken(void)
/*
* check for keywords
*/
if (checkkwd & CHKKWD) {
if (kwd & CHKKWD) {
const char *const *pp;
pp = findkwd(wordtext);

1
shell/ash_test/ash-heredoc/heredoc3.right Normal file
View File

@ -0,0 +1 @@
hello

9
shell/ash_test/ash-heredoc/heredoc3.tests Executable file
View File

@ -0,0 +1,9 @@
echo hello >greeting
cat <<EOF &&
$(cat greeting)
EOF
{
echo $?
cat greeting
} >/dev/null
rm greeting