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
|
BASH PATCH REPORT
=================
Bash-Release: 5.3
Patch-ID: bash53-008
Bug-Reported-by: Grisha Levit <grishalevit@gmail.com>
Bug-Reference-ID: <20251022174207.10518-1-grishalevit@gmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2025-10/msg00145.html
Bug-Description:
Bash tries to consume entire multibyte characters when looking for backslash
escapes in $'...' strings, and treats too many characters as potentially
beginning a multibyte character in UTF-8 locales. Being more selective about
when to call mbrtowc() can lead to optimized string processing and script
speedups. This patch also handles the unlikely situation of a locale
encoding null wide characters with non-null bytes.
Patch (apply with `patch -p0'):
*** ../bash-5.3-patched/lib/sh/strtrans.c Fri Oct 13 11:57:46 2023
--- lib/sh/strtrans.c Mon Oct 27 14:30:35 2025
***************
*** 56,60 ****
unsigned long v;
size_t clen;
! int mb_cur_max;
#if defined (HANDLE_MULTIBYTE)
wchar_t wc;
--- 56,60 ----
unsigned long v;
size_t clen;
! size_t mb_cur_max;
#if defined (HANDLE_MULTIBYTE)
wchar_t wc;
***************
*** 64,68 ****
return ((char *)0);
! mb_cur_max = MB_CUR_MAX;
#if defined (HANDLE_MULTIBYTE)
temp = 4*len + 4;
--- 64,68 ----
return ((char *)0);
! mb_cur_max = locale_mb_cur_max;
#if defined (HANDLE_MULTIBYTE)
temp = 4*len + 4;
***************
*** 80,87 ****
clen = 1;
#if defined (HANDLE_MULTIBYTE)
! if ((locale_utf8locale && (c & 0x80)) ||
! (locale_utf8locale == 0 && mb_cur_max > 0 && is_basic (c) == 0))
{
clen = mbrtowc (&wc, s - 1, mb_cur_max, 0);
if (MB_INVALIDCH (clen))
clen = 1;
--- 80,91 ----
clen = 1;
#if defined (HANDLE_MULTIBYTE)
! /* We read an entire multibyte character at a time if we are in a
! locale where a backslash can possibly appear as part of a
! multibyte character. UTF-8 encodings prohibit this. */
! if (locale_utf8locale == 0 && mb_cur_max > 1 && is_basic (c) == 0)
{
clen = mbrtowc (&wc, s - 1, mb_cur_max, 0);
+ if (MB_NULLWCH (clen))
+ break; /* it apparently can happen */
if (MB_INVALIDCH (clen))
clen = 1;
***************
*** 228,237 ****
char *r, *ret;
const char *s;
- size_t l, rsize;
unsigned char c;
size_t clen;
int b;
- #if defined (HANDLE_MULTIBYTE)
wchar_t wc;
#endif
--- 232,241 ----
char *r, *ret;
const char *s;
unsigned char c;
+ #if defined (HANDLE_MULTIBYTE)
size_t clen;
int b;
wchar_t wc;
+ DECLARE_MBSTATE;
#endif
***************
*** 239,245 ****
return ((char *)0);
! l = strlen (str);
! rsize = 4 * l + 4;
! r = ret = (char *)xmalloc (rsize);
*r++ = '$';
--- 243,247 ----
return ((char *)0);
! r = ret = (char *)xmalloc (4 * strlen (str) + 4);
*r++ = '$';
***************
*** 248,255 ****
for (s = str; c = *s; s++)
{
- b = 1; /* 1 == add backslash; 0 == no backslash */
- l = 1;
- clen = 1;
-
switch (c)
{
--- 250,253 ----
***************
*** 267,303 ****
default:
#if defined (HANDLE_MULTIBYTE)
! b = is_basic (c);
! /* XXX - clen comparison to 0 is dicey */
! if ((b == 0 && ((clen = mbrtowc (&wc, s, MB_CUR_MAX, 0)) < 0 || MB_INVALIDCH (clen) || iswprint (wc) == 0)) ||
! (b == 1 && ISPRINT (c) == 0))
! #else
! if (ISPRINT (c) == 0)
! #endif
{
! *r++ = '\\';
! *r++ = TOCHAR ((c >> 6) & 07);
! *r++ = TOCHAR ((c >> 3) & 07);
! *r++ = TOCHAR (c & 07);
! continue;
}
! l = 0;
! break;
! }
! if (b == 0 && clen == 0)
! break;
! if (l)
! *r++ = '\\';
!
! if (clen == 1)
! *r++ = c;
! else
! {
! for (b = 0; b < (int)clen; b++)
! *r++ = (unsigned char)s[b];
! s += clen - 1; /* -1 because of the increment above */
}
}
*r++ = '\'';
*r = '\0';
--- 265,304 ----
default:
#if defined (HANDLE_MULTIBYTE)
! if ((locale_utf8locale && (c & 0x80)) ||
! (locale_utf8locale == 0 && locale_mb_cur_max > 1 && is_basic (c) == 0))
{
! clen = mbrtowc (&wc, s, locale_mb_cur_max, &state);
! if (MB_NULLWCH (clen))
! goto quote_end;
! if (MB_INVALIDCH (clen))
! INITIALIZE_MBSTATE;
! else if (iswprint (wc))
! {
! for (b = 0; b < (int)clen; b++)
! *r++ = (unsigned char)s[b];
! s += clen - 1; /* -1 because of the increment above */
! continue;
! }
}
! else
! #endif
! if (ISPRINT (c))
! {
! *r++ = c;
! continue;
! }
! *r++ = '\\';
! *r++ = TOCHAR ((c >> 6) & 07);
! *r++ = TOCHAR ((c >> 3) & 07);
! *r++ = TOCHAR (c & 07);
! continue;
}
+
+ *r++ = '\\';
+ *r++ = c;
}
+ quote_end:
*r++ = '\'';
*r = '\0';
***************
*** 349,353 ****
{
#if defined (HANDLE_MULTIBYTE)
! if (is_basic (c) == 0)
return (ansic_wshouldquote (s));
#endif
--- 350,355 ----
{
#if defined (HANDLE_MULTIBYTE)
! if ((locale_utf8locale && (c & 0x80)) ||
! (locale_utf8locale == 0 && locale_mb_cur_max > 1 && is_basic (c) == 0))
return (ansic_wshouldquote (s));
#endif
*** ../bash-5.3/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 7
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 8
#endif /* _PATCHLEVEL_H_ */
|
