1 files changed, 4 insertions, 1 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 83cac3fb0..5fb67c0fa 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11607,7 +11607,7 @@ list(int nlflag)
 
         n1 = NULL;
         for (;;) {
-                switch (peektoken()) {
+                switch (readtoken()) {
                 case TNL:
                         if (!(nlflag & 1))
                                 break;
@@ -11618,9 +11618,12 @@ list(int nlflag)
                         if (!n1 && (nlflag & 1))
                                 n1 = NODE_EOF;
                         parseheredoc();
+                        tokpushback++;
+                        lasttoken = TEOF;
                         return n1;
                 }
 
+                tokpushback++;
                 checkkwd = CHKNL | CHKKWD | CHKALIAS;
                 if (nlflag == 2 && ((1 << peektoken()) & tokendlist))
                         return n1;