summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorRon Yorston2015-10-29 16:44:56 +0000
committerDenys Vlasenko2015-10-29 20:45:36 +0100
commit713f07d906d9171953be0c12e2369869855b6ca6 (patch)
tree925c1248b01de9ad188f9ebf7e48fac3b3838fe9 /shell/ash.c
parent7b14ede049d467e1a6da46ef69b917645e94a6b9 (diff)
downloadbusybox-713f07d906d9171953be0c12e2369869855b6ca6.zip
busybox-713f07d906d9171953be0c12e2369869855b6ca6.tar.gz
ash: fix error during recursive processing of here document
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>
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 0d7cac0..384c7b9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -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);