← Commit list

f15aa57a7

Denys Vlasenko
Denys Vlasenko
2016-10-26
SUCCESS Duration: 246s

Subject

ash: [PARSER] Fix parsing of ${##1}

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash.c +18 -10shell/ash_test/ash-vars/param_expand_len.right +3 -0shell/ash_test/ash-vars/param_expand_len.tests +7 -0shell/hush_test/hush-vars/param_expand_len.right +3 -0shell/hush_test/hush-vars/param_expand_len.tests +7 -0
shell/ash.c+18 -10
@@ -11728,16 +11728,9 @@ parsesub: {
subtype = VSNORMAL;
if (c == '{') {
c = pgetc_eatbnl();
- if (c == '#') {
- c = pgetc_eatbnl();
- if (c == '}')
- c = '#'; /* ${#} - same as $# */
- else
- subtype = VSLENGTH; /* ${#VAR} */
- } else {
- subtype = 0;
- }
+ subtype = 0;
}
+ varname:
if (c <= 255 /* not PEOA or PEOF */ && is_name(c)) {
/* $[{[#]]NAME[}] */
do {
@@ -11752,8 +11745,23 @@ parsesub: {
} while (isdigit(c));
} else if (is_special(c)) {
/* $[{[#]]<specialchar>[}] */
- USTPUTC(c, out);
+ int cc = c;
+
c = pgetc_eatbnl();
+ if (!subtype && cc == '#') {
+ subtype = VSLENGTH;
+ if (c == '_' || isalnum(c))
+ goto varname;
+ cc = c;
+ c = pgetc_eatbnl();
+ if (cc == '}' || c != '}') {
+ pungetc();
+ subtype = 0;
+ c = cc;
+ cc = '#';
+ }
+ }
+ USTPUTC(cc, out);
} else {
goto badsub;
}
shell/ash_test/ash-vars/param_expand_len.right+3 -0
@@ -7,3 +7,6 @@ Make sure len parsing doesnt break arg count
Testing len op
4 3 2 1 0 0
0 3 0
+Nothing:
+Nothing:
+One:1
shell/ash_test/ash-vars/param_expand_len.tests+7 -0
@@ -15,3 +15,10 @@ unset e
f=abc
g=
echo ${#e} ${#f} ${#g}
+
+set -- a
+# This must be interpreted as: $# ("1"), then remove trailing "1".
+# IOW: empty result.
+echo Nothing:${##1}
+echo Nothing:${#%1}
+echo One:${##x}
shell/hush_test/hush-vars/param_expand_len.right+3 -0
@@ -7,3 +7,6 @@ Make sure len parsing doesnt break arg count
Testing len op
4 3 2 1 0 0
0 3 0
+Nothing:
+Nothing:
+One:1
shell/hush_test/hush-vars/param_expand_len.tests+7 -0
@@ -15,3 +15,10 @@ unset e
f=abc
g=
echo ${#e} ${#f} ${#g}
+
+set -- a
+# This must be interpreted as: $# ("1"), then remove trailing "1".
+# IOW: empty result.
+echo Nothing:${##1}
+echo Nothing:${#%1}
+echo One:${##x}