From 856af4e3dc2406df7a2baed8058188acca9dbde6 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Fri, 18 Mar 2016 11:29:19 +0000 Subject: [PATCH] ash: fix corruption of ${#var} if $var contains UTF-8 characters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As reported in bug 8506: $ X=abcdÉfghÍjklmnÓpqrstÚvwcyz $ echo ${#X} abcd26 The result should be 26. This regression was introduced by: 2015-05-18 [Ron Yorston] ash: code shrink around varvalue The length in characters was being used to discard the contents of the variable instead of the length in bytes. URL: https://bugs.busybox.net/8506 Reported-by: Martijn Dekker Signed-off-by: Ron Yorston Signed-off-by: Mike Frysinger (cherry picked from commit 3e3bfb896e0dd8a54caad9c6264e2452566b4012) --- shell/ash.c | 2 ++ shell/ash_test/ash-vars/var-utf8-length.right | 1 + shell/ash_test/ash-vars/var-utf8-length.tests | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 shell/ash_test/ash-vars/var-utf8-length.right create mode 100755 shell/ash_test/ash-vars/var-utf8-length.tests diff --git a/shell/ash.c b/shell/ash.c index 256e933e3..96aa2a223 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -6693,6 +6693,8 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list) if (subtype == VSLENGTH && len > 0) { reinit_unicode_for_ash(); if (unicode_status == UNICODE_ON) { + STADJUST(-len, expdest); + discard = 0; len = unicode_strlen(p); } } diff --git a/shell/ash_test/ash-vars/var-utf8-length.right b/shell/ash_test/ash-vars/var-utf8-length.right new file mode 100644 index 000000000..6f4247a62 --- /dev/null +++ b/shell/ash_test/ash-vars/var-utf8-length.right @@ -0,0 +1 @@ +26 diff --git a/shell/ash_test/ash-vars/var-utf8-length.tests b/shell/ash_test/ash-vars/var-utf8-length.tests new file mode 100755 index 000000000..d04b2cbb6 --- /dev/null +++ b/shell/ash_test/ash-vars/var-utf8-length.tests @@ -0,0 +1,2 @@ +X=abcdÉfghÍjklmnÓpqrstÚvwcyz +echo ${#X} -- 2.25.1