Skip to content

Commit 7b15299

Browse files
nikicnikic
committed
Don't short-circuit MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE
Make sure we always go through mbfl_filt_conv_illegal_output(), so that the number of illegal characters gets counted.
1 parent 699b465 commit 7b15299

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+68
-195
lines changed

‎ext/mbstring/libmbfl/filters/mbfilter_armscii8.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ int mbfl_filt_conv_wchar_armscii8(int c, mbfl_convert_filter *filter)
133133
if (s >= 0) {
134134
CK((*filter->output_function)(s, filter->data));
135135
} else {
136-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
137-
CK(mbfl_filt_conv_illegal_output(c, filter));
138-
}
136+
CK(mbfl_filt_conv_illegal_output(c, filter));
139137
}
140138

141139
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_ascii.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ int mbfl_filt_conv_wchar_ascii(int c, mbfl_convert_filter *filter)
9494
if (c >= 0 && c < 0x80) {
9595
CK((*filter->output_function)(c, filter->data));
9696
} else {
97-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
98-
CK(mbfl_filt_conv_illegal_output(c, filter));
99-
}
97+
CK(mbfl_filt_conv_illegal_output(c, filter));
10098
}
10199

102100
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_big5.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ mbfl_filt_conv_wchar_big5(int c, mbfl_convert_filter *filter)
319319
CK((*filter->output_function)(s & 0xff, filter->data));
320320
}
321321
} else {
322-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
323-
CK(mbfl_filt_conv_illegal_output(c, filter));
324-
}
322+
CK(mbfl_filt_conv_illegal_output(c, filter));
325323
}
326324

327325
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp1251.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ mbfl_filt_conv_wchar_cp1251(int c, mbfl_convert_filter *filter)
133133
if (s >= 0) {
134134
CK((*filter->output_function)(s, filter->data));
135135
} else {
136-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
137-
CK(mbfl_filt_conv_illegal_output(c, filter));
138-
}
136+
CK(mbfl_filt_conv_illegal_output(c, filter));
139137
}
140138

141139
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp1252.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ int mbfl_filt_conv_wchar_cp1252(int c, mbfl_convert_filter *filter)
106106
if (s >= 0) {
107107
CK((*filter->output_function)(s, filter->data));
108108
} else {
109-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
110-
CK(mbfl_filt_conv_illegal_output(c, filter));
111-
}
109+
CK(mbfl_filt_conv_illegal_output(c, filter));
112110
}
113111
return c;
114112
}

‎ext/mbstring/libmbfl/filters/mbfilter_cp1254.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ mbfl_filt_conv_wchar_cp1254(int c, mbfl_convert_filter *filter)
105105
if (s >= 0) {
106106
CK((*filter->output_function)(s, filter->data));
107107
} else {
108-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
109-
CK(mbfl_filt_conv_illegal_output(c, filter));
110-
}
108+
CK(mbfl_filt_conv_illegal_output(c, filter));
111109
}
112110

113111
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,7 @@ mbfl_filt_conv_wchar_jis_ms(int c, mbfl_convert_filter *filter)
563563
CK((*filter->output_function)(s & 0x7f, filter->data));
564564
}
565565
} else {
566-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
567-
CK(mbfl_filt_conv_illegal_output(c, filter));
568-
}
566+
CK(mbfl_filt_conv_illegal_output(c, filter));
569567
}
570568

571569
return c;
@@ -776,9 +774,7 @@ mbfl_filt_conv_wchar_cp50221(int c, mbfl_convert_filter *filter)
776774
CK((*filter->output_function)((s >> 8) & 0x7f, filter->data));
777775
CK((*filter->output_function)(s & 0x7f, filter->data));
778776
} else if (s < 0x10000) { /* X0212 */
779-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
780-
CK(mbfl_filt_conv_illegal_output(c, filter));
781-
}
777+
CK(mbfl_filt_conv_illegal_output(c, filter));
782778
} else { /* X 0201 latin */
783779
if ((filter->status & 0xff00) != 0x400) {
784780
CK((*filter->output_function)(0x1b, filter->data)); /* ESC */
@@ -789,9 +785,7 @@ mbfl_filt_conv_wchar_cp50221(int c, mbfl_convert_filter *filter)
789785
CK((*filter->output_function)(s & 0x7f, filter->data));
790786
}
791787
} else {
792-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
793-
CK(mbfl_filt_conv_illegal_output(c, filter));
794-
}
788+
CK(mbfl_filt_conv_illegal_output(c, filter));
795789
}
796790

797791
return c;
@@ -928,9 +922,7 @@ mbfl_filt_conv_wchar_cp50222(int c, mbfl_convert_filter *filter)
928922
CK((*filter->output_function)((s >> 8) & 0x7f, filter->data));
929923
CK((*filter->output_function)(s & 0x7f, filter->data));
930924
} else if (s < 0x10000) { /* X0212 */
931-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
932-
CK(mbfl_filt_conv_illegal_output(c, filter));
933-
}
925+
CK(mbfl_filt_conv_illegal_output(c, filter));
934926
} else { /* X 0201 latin */
935927
if ((filter->status & 0xff00) == 0x500) {
936928
CK((*filter->output_function)(0x0f, filter->data)); /* SO */
@@ -945,9 +937,7 @@ mbfl_filt_conv_wchar_cp50222(int c, mbfl_convert_filter *filter)
945937
CK((*filter->output_function)(s & 0x7f, filter->data));
946938
}
947939
} else {
948-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
949-
CK(mbfl_filt_conv_illegal_output(c, filter));
950-
}
940+
CK(mbfl_filt_conv_illegal_output(c, filter));
951941
}
952942

953943
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp51932.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,10 @@ mbfl_filt_conv_wchar_cp51932(int c, mbfl_convert_filter *filter)
294294
CK((*filter->output_function)(((s1 >> 8) & 0xff) | 0x80, filter->data));
295295
CK((*filter->output_function)((s1 & 0xff) | 0x80, filter->data));
296296
} else {
297-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
298297
CK(mbfl_filt_conv_illegal_output(c, filter));
299-
}
300298
}
301299
} else {
302-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
303-
CK(mbfl_filt_conv_illegal_output(c, filter));
304-
}
300+
CK(mbfl_filt_conv_illegal_output(c, filter));
305301
}
306302

307303
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp850.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ mbfl_filt_conv_wchar_cp850(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp866.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ mbfl_filt_conv_wchar_cp866(int c, mbfl_convert_filter *filter)
133133
if (s >= 0) {
134134
CK((*filter->output_function)(s, filter->data));
135135
} else {
136-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
137-
CK(mbfl_filt_conv_illegal_output(c, filter));
138-
}
136+
CK(mbfl_filt_conv_illegal_output(c, filter));
139137
}
140138

141139
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp932.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,7 @@ mbfl_filt_conv_wchar_cp932(int c, mbfl_convert_filter *filter)
321321
CK((*filter->output_function)(s2, filter->data));
322322
}
323323
} else {
324-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
325-
CK(mbfl_filt_conv_illegal_output(c, filter));
326-
}
324+
CK(mbfl_filt_conv_illegal_output(c, filter));
327325
}
328326

329327
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_cp936.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,7 @@ mbfl_filt_conv_wchar_cp936(int c, mbfl_convert_filter *filter)
281281
CK((*filter->output_function)(s & 0xff, filter->data));
282282
}
283283
} else {
284-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
285-
CK(mbfl_filt_conv_illegal_output(c, filter));
286-
}
284+
CK(mbfl_filt_conv_illegal_output(c, filter));
287285
}
288286

289287
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,7 @@ mbfl_filt_conv_wchar_euccn(int c, mbfl_convert_filter *filter)
207207
CK((*filter->output_function)(s & 0xff, filter->data));
208208
}
209209
} else {
210-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
211-
CK(mbfl_filt_conv_illegal_output(c, filter));
212-
}
210+
CK(mbfl_filt_conv_illegal_output(c, filter));
213211
}
214212

215213
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,7 @@ mbfl_filt_conv_wchar_eucjp(int c, mbfl_convert_filter *filter)
269269
CK((*filter->output_function)((s & 0xff) | 0x80, filter->data));
270270
}
271271
} else {
272-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
273-
CK(mbfl_filt_conv_illegal_output(c, filter));
274-
}
272+
CK(mbfl_filt_conv_illegal_output(c, filter));
275273
}
276274

277275
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,7 @@ mbfl_filt_conv_wchar_eucjpwin(int c, mbfl_convert_filter *filter)
373373
CK((*filter->output_function)((s1 & 0xff) | 0x80, filter->data));
374374
}
375375
} else {
376-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
377-
CK(mbfl_filt_conv_illegal_output(c, filter));
378-
}
376+
CK(mbfl_filt_conv_illegal_output(c, filter));
379377
}
380378

381379
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,7 @@ mbfl_filt_conv_wchar_euckr(int c, mbfl_convert_filter *filter)
221221
CK((*filter->output_function)(s & 0xff, filter->data));
222222
}
223223
} else {
224-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
225-
CK(mbfl_filt_conv_illegal_output(c, filter));
226-
}
224+
CK(mbfl_filt_conv_illegal_output(c, filter));
227225
}
228226

229227
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,7 @@ mbfl_filt_conv_wchar_euctw(int c, mbfl_convert_filter *filter)
270270
CK((*filter->output_function)(s & 0xff, filter->data));
271271
}
272272
} else {
273-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
274-
CK(mbfl_filt_conv_illegal_output(c, filter));
275-
}
273+
CK(mbfl_filt_conv_illegal_output(c, filter));
276274
}
277275
return c;
278276
}

‎ext/mbstring/libmbfl/filters/mbfilter_gb18030.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,7 @@ mbfl_filt_conv_wchar_gb18030(int c, mbfl_convert_filter *filter)
412412
CK((*filter->output_function)(s & 0xff, filter->data));
413413
}
414414
} else {
415-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
416-
CK(mbfl_filt_conv_illegal_output(c, filter));
417-
}
415+
CK(mbfl_filt_conv_illegal_output(c, filter));
418416
}
419417

420418
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_hz.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ mbfl_filt_conv_wchar_hz(int c, mbfl_convert_filter *filter)
211211
CK((*filter->output_function)(s & 0x7f, filter->data));
212212
}
213213
} else {
214-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
215-
CK(mbfl_filt_conv_illegal_output(c, filter));
216-
}
214+
CK(mbfl_filt_conv_illegal_output(c, filter));
217215
}
218216

219217
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,7 @@ mbfl_filt_conv_wchar_2022jpms(int c, mbfl_convert_filter *filter)
408408
CK((*filter->output_function)(s1 & 0x7f, filter->data));
409409
}
410410
} else {
411-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
412-
CK(mbfl_filt_conv_illegal_output(c, filter));
413-
}
411+
CK(mbfl_filt_conv_illegal_output(c, filter));
414412
}
415413

416414
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,7 @@ mbfl_filt_conv_wchar_2022kr(int c, mbfl_convert_filter *filter)
263263
CK((*filter->output_function)(s & 0xff, filter->data));
264264
}
265265
} else {
266-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
267-
CK(mbfl_filt_conv_illegal_output(c, filter));
268-
}
266+
CK(mbfl_filt_conv_illegal_output(c, filter));
269267
}
270268

271269
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,7 @@ mbfl_filt_conv_wchar_2022jp_mobile(int c, mbfl_convert_filter *filter)
426426
CK((*filter->output_function)(s1 & 0x7f, filter->data));
427427
}
428428
} else {
429-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
430-
CK(mbfl_filt_conv_illegal_output(c, filter));
431-
}
429+
CK(mbfl_filt_conv_illegal_output(c, filter));
432430
}
433431

434432
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ int mbfl_filt_conv_wchar_8859_1(int c, mbfl_convert_filter *filter)
9191
if (c >= 0 && c < 0x100) {
9292
CK((*filter->output_function)(c, filter->data));
9393
} else {
94-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
95-
CK(mbfl_filt_conv_illegal_output(c, filter));
96-
}
94+
CK(mbfl_filt_conv_illegal_output(c, filter));
9795
}
9896

9997
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ int mbfl_filt_conv_wchar_8859_10(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ int mbfl_filt_conv_wchar_8859_13(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ int mbfl_filt_conv_wchar_8859_14(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ int mbfl_filt_conv_wchar_8859_15(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ int mbfl_filt_conv_wchar_8859_16(int c, mbfl_convert_filter *filter)
129129
if (s >= 0) {
130130
CK((*filter->output_function)(s, filter->data));
131131
} else {
132-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
133-
CK(mbfl_filt_conv_illegal_output(c, filter));
134-
}
132+
CK(mbfl_filt_conv_illegal_output(c, filter));
135133
}
136134

137135
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ int mbfl_filt_conv_wchar_8859_2(int c, mbfl_convert_filter *filter)
130130
if (s >= 0) {
131131
CK((*filter->output_function)(s, filter->data));
132132
} else {
133-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
134-
CK(mbfl_filt_conv_illegal_output(c, filter));
135-
}
133+
CK(mbfl_filt_conv_illegal_output(c, filter));
136134
}
137135

138136
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ int mbfl_filt_conv_wchar_8859_3(int c, mbfl_convert_filter *filter)
130130
if (s >= 0) {
131131
CK((*filter->output_function)(s, filter->data));
132132
} else {
133-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
134-
CK(mbfl_filt_conv_illegal_output(c, filter));
135-
}
133+
CK(mbfl_filt_conv_illegal_output(c, filter));
136134
}
137135

138136
return c;

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ int mbfl_filt_conv_wchar_8859_4(int c, mbfl_convert_filter *filter)
128128
if (s >= 0) {
129129
CK((*filter->output_function)(s, filter->data));
130130
} else {
131-
if (filter->illegal_mode != MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
132-
CK(mbfl_filt_conv_illegal_output(c, filter));
133-
}
131+
CK(mbfl_filt_conv_illegal_output(c, filter));
134132
}
135133

136134
return c;

0 commit comments

Comments
 (0)