- Notifications
You must be signed in to change notification settings - Fork5
Commit0d65eea
committed
Replace argument-checking Asserts with regular test-and-elog checks in all
encoding conversion functions. These are not can't-happen cases becauseit's possible to create a conversion with the wrong conversion functionfor the specified encoding pair. That would lead to an Assert crash inan Assert-enabled build, or incorrect conversion otherwise, neither ofwhich is desirable. This would be a DOS issue if production databaseswere customarily built with asserts enabled, but fortunately that's not so.Per an observation by Heikki.Back-patch to all supported branches.1 parentb5b3134 commit0d65eea
File tree
28 files changed
+166
-282
lines changed- src
- backend/utils/mb
- conversion_procs
- ascii_and_mic
- cyrillic_and_mic
- euc_cn_and_mic
- euc_jis_2004_and_shift_jis_2004
- euc_jp_and_sjis
- euc_kr_and_mic
- euc_tw_and_big5
- latin2_and_win1250
- latin_and_mic
- utf8_and_ascii
- utf8_and_big5
- utf8_and_cyrillic
- utf8_and_euc_cn
- utf8_and_euc_jis_2004
- utf8_and_euc_jp
- utf8_and_euc_kr
- utf8_and_euc_tw
- utf8_and_gb18030
- utf8_and_gbk
- utf8_and_iso8859
- utf8_and_iso8859_1
- utf8_and_johab
- utf8_and_shift_jis_2004
- utf8_and_sjis
- utf8_and_uhc
- utf8_and_win
- include/mb
28 files changed
+166
-282
lines changedLines changed: 3 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
| |||
41 | 41 |
| |
42 | 42 |
| |
43 | 43 |
| |
44 |
| - | |
45 |
| - | |
46 |
| - | |
| 44 | + | |
47 | 45 |
| |
48 | 46 |
| |
49 | 47 |
| |
| |||
57 | 55 |
| |
58 | 56 |
| |
59 | 57 |
| |
60 |
| - | |
61 |
| - | |
62 |
| - | |
| 58 | + | |
63 | 59 |
| |
64 | 60 |
| |
65 | 61 |
| |
|
Lines changed: 21 additions & 61 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
| |||
88 | 88 |
| |
89 | 89 |
| |
90 | 90 |
| |
91 |
| - | |
92 |
| - | |
93 |
| - | |
| 91 | + | |
94 | 92 |
| |
95 | 93 |
| |
96 | 94 |
| |
| |||
104 | 102 |
| |
105 | 103 |
| |
106 | 104 |
| |
107 |
| - | |
108 |
| - | |
109 |
| - | |
| 105 | + | |
110 | 106 |
| |
111 | 107 |
| |
112 | 108 |
| |
| |||
120 | 116 |
| |
121 | 117 |
| |
122 | 118 |
| |
123 |
| - | |
124 |
| - | |
125 |
| - | |
| 119 | + | |
126 | 120 |
| |
127 | 121 |
| |
128 | 122 |
| |
| |||
136 | 130 |
| |
137 | 131 |
| |
138 | 132 |
| |
139 |
| - | |
140 |
| - | |
141 |
| - | |
| 133 | + | |
142 | 134 |
| |
143 | 135 |
| |
144 | 136 |
| |
| |||
152 | 144 |
| |
153 | 145 |
| |
154 | 146 |
| |
155 |
| - | |
156 |
| - | |
157 |
| - | |
| 147 | + | |
158 | 148 |
| |
159 | 149 |
| |
160 | 150 |
| |
| |||
168 | 158 |
| |
169 | 159 |
| |
170 | 160 |
| |
171 |
| - | |
172 |
| - | |
173 |
| - | |
| 161 | + | |
174 | 162 |
| |
175 | 163 |
| |
176 | 164 |
| |
| |||
184 | 172 |
| |
185 | 173 |
| |
186 | 174 |
| |
187 |
| - | |
188 |
| - | |
189 |
| - | |
| 175 | + | |
190 | 176 |
| |
191 | 177 |
| |
192 | 178 |
| |
| |||
200 | 186 |
| |
201 | 187 |
| |
202 | 188 |
| |
203 |
| - | |
204 |
| - | |
205 |
| - | |
| 189 | + | |
206 | 190 |
| |
207 | 191 |
| |
208 | 192 |
| |
| |||
217 | 201 |
| |
218 | 202 |
| |
219 | 203 |
| |
220 |
| - | |
221 |
| - | |
222 |
| - | |
| 204 | + | |
223 | 205 |
| |
224 | 206 |
| |
225 | 207 |
| |
| |||
237 | 219 |
| |
238 | 220 |
| |
239 | 221 |
| |
240 |
| - | |
241 |
| - | |
242 |
| - | |
| 222 | + | |
243 | 223 |
| |
244 | 224 |
| |
245 | 225 |
| |
| |||
257 | 237 |
| |
258 | 238 |
| |
259 | 239 |
| |
260 |
| - | |
261 |
| - | |
262 |
| - | |
| 240 | + | |
263 | 241 |
| |
264 | 242 |
| |
265 | 243 |
| |
| |||
277 | 255 |
| |
278 | 256 |
| |
279 | 257 |
| |
280 |
| - | |
281 |
| - | |
282 |
| - | |
| 258 | + | |
283 | 259 |
| |
284 | 260 |
| |
285 | 261 |
| |
| |||
297 | 273 |
| |
298 | 274 |
| |
299 | 275 |
| |
300 |
| - | |
301 |
| - | |
302 |
| - | |
| 276 | + | |
303 | 277 |
| |
304 | 278 |
| |
305 | 279 |
| |
| |||
323 | 297 |
| |
324 | 298 |
| |
325 | 299 |
| |
326 |
| - | |
327 |
| - | |
328 |
| - | |
| 300 | + | |
329 | 301 |
| |
330 | 302 |
| |
331 | 303 |
| |
| |||
344 | 316 |
| |
345 | 317 |
| |
346 | 318 |
| |
347 |
| - | |
348 |
| - | |
349 |
| - | |
| 319 | + | |
350 | 320 |
| |
351 | 321 |
| |
352 | 322 |
| |
| |||
364 | 334 |
| |
365 | 335 |
| |
366 | 336 |
| |
367 |
| - | |
368 |
| - | |
369 |
| - | |
| 337 | + | |
370 | 338 |
| |
371 | 339 |
| |
372 | 340 |
| |
| |||
384 | 352 |
| |
385 | 353 |
| |
386 | 354 |
| |
387 |
| - | |
388 |
| - | |
389 |
| - | |
| 355 | + | |
390 | 356 |
| |
391 | 357 |
| |
392 | 358 |
| |
| |||
405 | 371 |
| |
406 | 372 |
| |
407 | 373 |
| |
408 |
| - | |
409 |
| - | |
410 |
| - | |
| 374 | + | |
411 | 375 |
| |
412 | 376 |
| |
413 | 377 |
| |
| |||
426 | 390 |
| |
427 | 391 |
| |
428 | 392 |
| |
429 |
| - | |
430 |
| - | |
431 |
| - | |
| 393 | + | |
432 | 394 |
| |
433 | 395 |
| |
434 | 396 |
| |
| |||
447 | 409 |
| |
448 | 410 |
| |
449 | 411 |
| |
450 |
| - | |
451 |
| - | |
452 |
| - | |
| 412 | + | |
453 | 413 |
| |
454 | 414 |
| |
455 | 415 |
| |
|
Lines changed: 3 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
| |||
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 |
| - | |
48 |
| - | |
49 |
| - | |
| 47 | + | |
50 | 48 |
| |
51 | 49 |
| |
52 | 50 |
| |
| |||
60 | 58 |
| |
61 | 59 |
| |
62 | 60 |
| |
63 |
| - | |
64 |
| - | |
65 |
| - | |
| 61 | + | |
66 | 62 |
| |
67 | 63 |
| |
68 | 64 |
| |
|
Lines changed: 3 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
8 |
| - | |
| 8 | + | |
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
| |||
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
46 |
| - | |
47 |
| - | |
48 |
| - | |
| 46 | + | |
49 | 47 |
| |
50 | 48 |
| |
51 | 49 |
| |
| |||
59 | 57 |
| |
60 | 58 |
| |
61 | 59 |
| |
62 |
| - | |
63 |
| - | |
64 |
| - | |
| 60 | + | |
65 | 61 |
| |
66 | 62 |
| |
67 | 63 |
| |
|
Lines changed: 7 additions & 19 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
| |||
70 | 70 |
| |
71 | 71 |
| |
72 | 72 |
| |
73 |
| - | |
74 |
| - | |
75 |
| - | |
| 73 | + | |
76 | 74 |
| |
77 | 75 |
| |
78 | 76 |
| |
| |||
86 | 84 |
| |
87 | 85 |
| |
88 | 86 |
| |
89 |
| - | |
90 |
| - | |
91 |
| - | |
| 87 | + | |
92 | 88 |
| |
93 | 89 |
| |
94 | 90 |
| |
| |||
102 | 98 |
| |
103 | 99 |
| |
104 | 100 |
| |
105 |
| - | |
106 |
| - | |
107 |
| - | |
| 101 | + | |
108 | 102 |
| |
109 | 103 |
| |
110 | 104 |
| |
| |||
118 | 112 |
| |
119 | 113 |
| |
120 | 114 |
| |
121 |
| - | |
122 |
| - | |
123 |
| - | |
| 115 | + | |
124 | 116 |
| |
125 | 117 |
| |
126 | 118 |
| |
| |||
134 | 126 |
| |
135 | 127 |
| |
136 | 128 |
| |
137 |
| - | |
138 |
| - | |
139 |
| - | |
| 129 | + | |
140 | 130 |
| |
141 | 131 |
| |
142 | 132 |
| |
| |||
150 | 140 |
| |
151 | 141 |
| |
152 | 142 |
| |
153 |
| - | |
154 |
| - | |
155 |
| - | |
| 143 | + | |
156 | 144 |
| |
157 | 145 |
| |
158 | 146 |
| |
|
0 commit comments
Comments
(0)