Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

4 files changed, 25 insertions, 14 deletions

diff --git a/shell/ash.c b/shell/ash.c
index b95356034..df7083370 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7075,6 +7075,14 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list)
                 len = strlen(p);
                 if (!(subtype == VSPLUS || subtype == VSLENGTH))
                         memtodest(p, len, syntax, quotes);
+#if ENABLE_UNICODE_SUPPORT
+                if (subtype == VSLENGTH && len > 0) {
+                        reinit_unicode_for_ash();
+                        if (unicode_status == UNICODE_ON) {
+                                len = unicode_strlen(p);
+                        }
+                }
+#endif
                 return len;
         }
 
@@ -7158,15 +7166,7 @@ evalvar(char *p, int flags, struct strlist *var_str_list)
                 varunset(p, var, 0, 0);
 
         if (subtype == VSLENGTH) {
-                ssize_t n = varlen;
-                if (n > 0) {
-                        reinit_unicode_for_ash();
-                        if (unicode_status == UNICODE_ON) {
-                                const char *val = lookupvar(var);
-                                n = unicode_strlen(val);
-                        }
-                }
-                cvtnum(n > 0 ? n : 0);
+                cvtnum(varlen > 0 ? varlen : 0);
                 goto record;
         }
 
@@ -10981,7 +10981,7 @@ static union node *andor(void);
 static union node *pipeline(void);
 static union node *parse_command(void);
 static void parseheredoc(void);
-static char peektoken(void);
+static char nexttoken_ends_list(void);
 static int readtoken(void);
 
 static union node *
@@ -10991,7 +10991,7 @@ list(int nlflag)
         int tok;
 
         checkkwd = CHKNL | CHKKWD | CHKALIAS;
-        if (nlflag == 2 && peektoken())
+        if (nlflag == 2 && nexttoken_ends_list())
                 return NULL;
         n1 = NULL;
         for (;;) {
@@ -11033,8 +11033,15 @@ list(int nlflag)
                                 tokpushback = 1;
                         }
                         checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                        if (peektoken())
+                        if (nexttoken_ends_list()) {
+                                /* Testcase: "<<EOF; then <W".
+                                 * It used to segfault w/o this check:
+                                 */
+                                if (heredoclist) {
+                                        raise_error_unexpected_syntax(-1);
+                                }
                                 return n1;
+                        }
                         break;
                 case TEOF:
                         if (heredoclist)
@@ -12471,7 +12478,7 @@ readtoken(void)
 }
 
 static char
-peektoken(void)
+nexttoken_ends_list(void)
 {
         int t;
 
diff --git a/shell/ash_test/ash-heredoc/heredoc1.right b/shell/ash_test/ash-heredoc/heredoc1.right
new file mode 100644
index 000000000..895f5ee80
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc1.right
@@ -0,0 +1 @@
+heredoc1.tests: line 3: syntax error: unexpected "then"
diff --git a/shell/ash_test/ash-heredoc/heredoc1.tests b/shell/ash_test/ash-heredoc/heredoc1.tests
new file mode 100755
index 000000000..a912a67c7
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc1.tests
@@ -0,0 +1,3 @@
+# We used to SEGV on this:
+
+<<EOF; then <W
diff --git a/shell/hush.c b/shell/hush.c
index 92d790180..f2c0a70f2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -5884,7 +5884,7 @@ static FILE *generate_stream_from_string(const char *s, pid_t *pid_p)
                  * Our solution: ONLY bare $(trap) or `trap` is special.
                  */
                 s = skip_whitespace(s);
-                if (strncmp(s, "trap", 4) == 0
+                if (is_prefixed_with(s, "trap")
                  && skip_whitespace(s + 4)[0] == '\0'
                 ) {
                         static const char *const argv[] = { NULL, NULL };