1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
|
# DP: bash-4.2 upstream patch 003
BASH PATCH REPORT
=================
Bash-Release: 4.2
Patch-ID: bash42-003
Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com>
Bug-Reference-ID: <AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html
Bug-Description:
When using the pattern replacement and pattern removal word expansions, bash
miscalculates the possible match length in the presence of an unescaped left
bracket without a closing right bracket, resulting in a failure to match
the pattern.
Patch (apply with `patch -p0'):
--- a/bash/lib/glob/gmisc.c
+++ b/bash/lib/glob/gmisc.c
@@ -77,8 +77,8 @@
wchar_t *wpat;
size_t wmax;
{
- wchar_t wc, *wbrack;
- int matlen, t, in_cclass, in_collsym, in_equiv;
+ wchar_t wc;
+ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
if (*wpat == 0)
return (0);
@@ -118,58 +118,80 @@
break;
case L'[':
/* scan for ending `]', skipping over embedded [:...:] */
- wbrack = wpat;
+ bracklen = 1;
wc = *wpat++;
do
{
if (wc == 0)
{
- matlen += wpat - wbrack - 1; /* incremented below */
- break;
+ wpat--; /* back up to NUL */
+ matlen += bracklen;
+ goto bad_bracket;
}
else if (wc == L'\\')
{
- wc = *wpat++;
- if (*wpat == 0)
- break;
+ /* *wpat == backslash-escaped character */
+ bracklen++;
+ /* If the backslash or backslash-escape ends the string,
+ bail. The ++wpat skips over the backslash escape */
+ if (*wpat == 0 || *++wpat == 0)
+ {
+ matlen += bracklen;
+ goto bad_bracket;
+ }
}
else if (wc == L'[' && *wpat == L':') /* character class */
{
wpat++;
+ bracklen++;
in_cclass = 1;
}
else if (in_cclass && wc == L':' && *wpat == L']')
{
wpat++;
+ bracklen++;
in_cclass = 0;
}
else if (wc == L'[' && *wpat == L'.') /* collating symbol */
{
wpat++;
+ bracklen++;
if (*wpat == L']') /* right bracket can appear as collating symbol */
- wpat++;
+ {
+ wpat++;
+ bracklen++;
+ }
in_collsym = 1;
}
else if (in_collsym && wc == L'.' && *wpat == L']')
{
wpat++;
+ bracklen++;
in_collsym = 0;
}
else if (wc == L'[' && *wpat == L'=') /* equivalence class */
{
wpat++;
+ bracklen++;
if (*wpat == L']') /* right bracket can appear as equivalence class */
- wpat++;
+ {
+ wpat++;
+ bracklen++;
+ }
in_equiv = 1;
}
else if (in_equiv && wc == L'=' && *wpat == L']')
{
wpat++;
+ bracklen++;
in_equiv = 0;
}
+ else
+ bracklen++;
}
while ((wc = *wpat++) != L']');
matlen++; /* bracket expression can only match one char */
+bad_bracket:
break;
}
}
@@ -213,8 +235,8 @@
char *pat;
size_t max;
{
- char c, *brack;
- int matlen, t, in_cclass, in_collsym, in_equiv;
+ char c;
+ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
if (*pat == 0)
return (0);
@@ -254,58 +276,80 @@
break;
case '[':
/* scan for ending `]', skipping over embedded [:...:] */
- brack = pat;
+ bracklen = 1;
c = *pat++;
do
{
if (c == 0)
{
- matlen += pat - brack - 1; /* incremented below */
- break;
+ pat--; /* back up to NUL */
+ matlen += bracklen;
+ goto bad_bracket;
}
else if (c == '\\')
{
- c = *pat++;
- if (*pat == 0)
- break;
+ /* *pat == backslash-escaped character */
+ bracklen++;
+ /* If the backslash or backslash-escape ends the string,
+ bail. The ++pat skips over the backslash escape */
+ if (*pat == 0 || *++pat == 0)
+ {
+ matlen += bracklen;
+ goto bad_bracket;
+ }
}
else if (c == '[' && *pat == ':') /* character class */
{
pat++;
+ bracklen++;
in_cclass = 1;
}
else if (in_cclass && c == ':' && *pat == ']')
{
pat++;
+ bracklen++;
in_cclass = 0;
}
else if (c == '[' && *pat == '.') /* collating symbol */
{
pat++;
+ bracklen++;
if (*pat == ']') /* right bracket can appear as collating symbol */
- pat++;
+ {
+ pat++;
+ bracklen++;
+ }
in_collsym = 1;
}
else if (in_collsym && c == '.' && *pat == ']')
{
pat++;
+ bracklen++;
in_collsym = 0;
}
else if (c == '[' && *pat == '=') /* equivalence class */
{
pat++;
+ bracklen++;
if (*pat == ']') /* right bracket can appear as equivalence class */
- pat++;
+ {
+ pat++;
+ bracklen++;
+ }
in_equiv = 1;
}
else if (in_equiv && c == '=' && *pat == ']')
{
pat++;
+ bracklen++;
in_equiv = 0;
}
+ else
+ bracklen++;
}
while ((c = *pat++) != ']');
matlen++; /* bracket expression can only match one char */
+bad_bracket:
break;
}
}
--- a/bash/patchlevel.h
+++ b/bash/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 2
+#define PATCHLEVEL 3
#endif /* _PATCHLEVEL_H_ */
|
