tst-translit-mchar \
# test-srcs
+tests-internal = \
+ tst-iconv-sticky-input-error \
+ # tests-internal
+
others = iconv_prog iconvconfig
install-others-programs = $(inst_bindir)/iconv
install-sbin = iconvconfig
__END_DECLS
+/* Internal extensions for <gconv.h>. */
+
+/* Internal flags for __flags in struct __gconv_step_data. Overlaps
+ with flags for __gconv_open. */
+enum
+ {
+ /* The conversion encountered an illegal input character at one
+ point. */
+ __GCONV_ENCOUNTERED_ILLEGAL_INPUT = 1U << 30,
+ };
+
+/* Mark *STEP_DATA as having seen illegal input, and return
+ __GCONV_ILLEGAL_INPUT. */
+static inline int
+__gconv_mark_illegal_input (struct __gconv_step_data *step_data)
+{
+ step_data->__flags |= __GCONV_ENCOUNTERED_ILLEGAL_INPUT;
+ return __GCONV_ILLEGAL_INPUT;
+}
+
+/* Returns true if any of the conversion steps encountered illegal input. */
+static _Bool __attribute__ ((unused))
+__gconv_has_illegal_input (__gconv_t cd)
+{
+ for (size_t i = 0; i < cd->__nsteps; ++i)
+ if (cd->__data[i].__flags & __GCONV_ENCOUNTERED_ILLEGAL_INPUT)
+ return true;
+ return false;
+}
+
#endif /* gconv_int.h */
UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
if (flags & __GCONV_IGNORE_ERRORS)
{
*inptrp = inptr;
*outptrp = outptr;
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
}
put32 (outptr, inval);
if (!(flags & __GCONV_IGNORE_ERRORS))
{
*inptrp -= cnt - (state->__count & 7);
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
}
}
else
UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
if (flags & __GCONV_IGNORE_ERRORS)
{
*inptrp = inptr;
*outptrp = outptr;
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
}
put32 (outptr, inval);
represent the result. This is a genuine bug in the input since
UCS4 does not allow such values. */
if (!(flags & __GCONV_IGNORE_ERRORS))
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
}
else
{
surrogates pass through, attackers could make a security \
hole exploit by synthesizing any desired plane 1-16 \
character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
inptr += 4; \
them. (Catching this here is not security relevant.) */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
inptr += 2; \
character. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
inptr += 4; \
}
/* Haven't found a match. */
- return __GCONV_ILLEGAL_INPUT;
+ return __gconv_mark_illegal_input (step_data);
}
libc_hidden_def (__gconv_transliterate)
}
while (++remaining < argc);
+ /* Ensure that iconv -c still exits with failure if iconv (the
+ function) has failed with E2BIG instead of EILSEQ. */
+ if (__gconv_has_illegal_input (cd))
+ status = EXIT_FAILURE;
+
/* Close the output file now. */
if (output != NULL && fclose (output))
error (EXIT_FAILURE, errno, _("error while closing output file"));
`continue' must reach certain points. */
#define STANDARD_FROM_LOOP_ERR_HANDLER(Incr) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
- \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
\
points. */
#define STANDARD_TO_LOOP_ERR_HANDLER(Incr) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
\
if (irreversible == NULL) \
/* This means we are in call from __gconv_transliterate. In this \
--- /dev/null
+/* Test __GCONV_ENCOUNTERED_ILLEGAL_INPUT, as used by iconv -c (bug 32046).
+ Copyright (C) 2024 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+
+#include <array_length.h>
+#include <errno.h>
+#include <gconv_int.h>
+#include <iconv.h>
+#include <stdbool.h>
+#include <support/check.h>
+#include <support/support.h>
+#include <support/test-driver.h>
+#include <stdio.h>
+
+/* FROM is the input character set, TO the output character set. If
+ IGNORE is true, the iconv descriptor is set up in the same way as
+ iconv -c would. INPUT is the input string, EXPECTED_OUTPUT the
+ output. OUTPUT_LIMIT is a byte count, specifying how many input
+ bytes are passed to the iconv function on each invocation. */
+static void
+one_direction (const char *from, const char *to, bool ignore,
+ const char *input, const char *expected_output,
+ size_t output_limit)
+{
+ if (test_verbose)
+ {
+ char *quoted_input = support_quote_string (input);
+ char *quoted_output = support_quote_string (expected_output);
+ printf ("info: testing from=\"%s\" to=\"%s\" ignore=%d input=\"%s\""
+ " expected_output=\"%s\" output_limit=%zu\n",
+ from, to, (int) ignore, quoted_input,
+ quoted_output, output_limit);
+ free (quoted_output);
+ free (quoted_input);
+ }
+
+ __gconv_t cd;
+ if (ignore)
+ {
+ struct gconv_spec conv_spec;
+ TEST_VERIFY_EXIT (__gconv_create_spec (&conv_spec, from, to)
+ == &conv_spec);
+ conv_spec.ignore = true;
+ cd = (iconv_t) -1;
+ TEST_COMPARE (__gconv_open (&conv_spec, &cd, 0), __GCONV_OK);
+ __gconv_destroy_spec (&conv_spec);
+ }
+ else
+ cd = iconv_open (to, from);
+ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
+
+ char *input_ptr = (char *) input;
+ size_t input_len = strlen (input);
+ char output_buf[20];
+ char *output_ptr = output_buf;
+ size_t output_len;
+ do
+ {
+ output_len = array_end (output_buf) - output_ptr;
+ if (output_len > output_limit)
+ /* Limit the buffer size as requested by the caller. */
+ output_len = output_limit;
+ TEST_VERIFY_EXIT (output_len > 0);
+ if (input_len == 0)
+ /* Trigger final flush. */
+ input_ptr = NULL;
+ char *old_input_ptr = input_ptr;
+ size_t ret = iconv (cd, &input_ptr, &input_len,
+ &output_ptr, &output_len);
+ if (ret == (size_t) -1)
+ {
+ if (errno != EILSEQ)
+ TEST_COMPARE (errno, E2BIG);
+ }
+
+ if (input_ptr == old_input_ptr)
+ /* Avoid endless loop if stuck on an invalid input character. */
+ break;
+ }
+ while (input_ptr != NULL);
+
+ /* Test the sticky illegal input bit. */
+ TEST_VERIFY (__gconv_has_illegal_input (cd));
+
+ TEST_COMPARE_BLOB (expected_output, strlen (expected_output),
+ output_buf, output_ptr - output_buf);
+
+ TEST_COMPARE (iconv_close (cd), 0);
+}
+
+static int
+do_test (void)
+{
+ static const char charsets[][14] =
+ {
+ "ASCII",
+ "ASCII//IGNORE",
+ "UTF-8",
+ "UTF-8//IGNORE",
+ };
+
+ for (size_t from_idx = 0; from_idx < array_length (charsets); ++from_idx)
+ for (size_t to_idx = 0; to_idx < array_length (charsets); ++to_idx)
+ for (int do_ignore = 0; do_ignore < 2; ++do_ignore)
+ for (int limit = 1; limit < 5; ++limit)
+ for (int skip = 0; skip < 3; ++skip)
+ {
+ const char *expected_output;
+ if (do_ignore || strstr (charsets[to_idx], "//IGNORE") != NULL)
+ expected_output = "ABXY" + skip;
+ else
+ expected_output = "AB" + skip;
+ one_direction (charsets[from_idx], charsets[to_idx], do_ignore,
+ "AB\xffXY" + skip, expected_output, limit);
+ }
+
+ return 0;
+}
+
+#include <support/test-driver.c>
! test -s "$tmp/err"
expect_files abc def
-# FIXME: This is not correct, -c should not change the exit status.
cp "$tmp/out-template" "$tmp/out"
-run_iconv -c -o "$tmp/out" \
+expect_exit 1 run_iconv -c -o "$tmp/out" \
"$tmp/abc" "$tmp/0xff-wrapped" "$tmp/def" 2>"$tmp/err"
! test -s "$tmp/err"
expect_files abc xy zt def
if (! ignore_errors_p ()) \
{ \
/* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
if (! ignore_errors_p ()) \
{ \
/* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
if (! ignore_errors_p ()) \
{ \
/* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
/* This is illegal. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
if (! ignore_errors_p ()) \
{ \
/* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
} \
if (! ignore_errors_p ()) \
{ \
/* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
{ \
/* We do not have a mapping for this character. \
If ignore errors, map it to 0xa1bc - big5 box character */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
\
{ \
/* We do not have a mapping for this character. \
If ignore errors, map it to 0xa1f5 - gb box character */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
\
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
++*irreversible; \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
++*irreversible; \
\
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
++*irreversible; \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
{ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
break; \
} \
++*irreversible; \
ch = 0xf9; \
else if (var == JP_OCR_B) \
/* Illegal character. */ \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
else if (var == YU) \
ch = 0x17e; \
else if (var == HU) \
ch = 0xec; \
else if (var == JP_OCR_B) \
/* Illegal character. */ \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
else if (var == YU) \
ch = 0x10d; \
else if (var == HU) \
break; \
case 0x80 ... 0xff: \
/* Illegal character. */ \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
} \
\
case 0x23: \
if (var == GB || var == ES || var == IT || var == FR || var == FR1 \
|| var == NO2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x24: \
if (var == CN || var == HU || var == CU || var == SE || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x40: \
if (var == CA || var == CA2 || var == DE || var == ES || var == ES2 \
|| var == IT || var == YU || var == HU || var == FR || var == FR1 \
|| var == PT || var == PT2 || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x5b: \
if (var == CA || var == CA2 || var == DE || var == DK || var == ES \
|| var == HU || var == FR || var == FR1 || var == NO \
|| var == NO2 || var == PT || var == PT2 || var == SE \
|| var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
else if (var == CU) \
ch = 0x7d; \
break; \
|| var == YU || var == KR || var == HU || var == CU || var == FR \
|| var == FR1 || var == NO || var == NO2 || var == PT \
|| var == PT2 || var == SE || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x5d: \
if (var == CA || var == CA2 || var == DE || var == DK || var == ES \
|| var == HU || var == FR || var == FR1 || var == NO \
|| var == NO2 || var == PT || var == PT2 || var == SE \
|| var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x5e: \
if (var == CA || var == CA2 || var == ES2 || var == YU || var == CU \
|| var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x60: \
if (var == CA || var == CA2 || var == IT || var == JP_OCR_B \
|| var == YU || var == HU || var == FR || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x7b: \
if (var == CA || var == CA2 || var == DE || var == DK || var == ES \
|| var == CU || var == FR || var == FR1 || var == NO \
|| var == NO2 || var == PT || var == PT2 || var == SE \
|| var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x7c: \
if (var == CA || var == CA2 || var == DE || var == DK || var == ES \
|| var == ES2 || var == IT || var == YU || var == HU || var == CU \
|| var == FR || var == FR1 || var == NO || var == PT \
|| var == PT2 || var == SE || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
else if (var == NO2) \
ch = 0x7e; \
break; \
|| var == ES2 || var == IT || var == YU || var == HU || var == CU \
|| var == FR || var == FR1 || var == NO || var == NO2 \
|| var == PT || var == PT2 || var == SE || var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x7e: \
if (var == GB || var == CA || var == CA2 || var == DE || var == ES2 \
|| var == YU || var == HU || var == CU || var == FR || var == FR1 \
|| var == NO || var == NO2 || var == PT || var == SE \
|| var == SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xa1: \
if (var != ES && var != ES2 && var != CU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0xa3: \
if (var != GB && var != ES && var != IT && var != FR && var != FR1) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x23; \
break; \
case 0xa4: \
if (var != HU && var != CU && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x24; \
break; \
case 0xa5: \
else if (var == JP || var == JP_OCR_B) \
ch = 0x5c; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xa7: \
if (var == DE || var == ES || var == IT || var == PT) \
else if (var == NO2) \
ch = 0x23; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xa8: \
if (var != ES2 && var != CU && var != FR && var != FR1) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0xb0: \
else if (var == PT) \
ch = 0x7e; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xb4: \
if (var == ES2 || var == CU) \
else if (var == PT2) \
ch = 0x40; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xb5: \
if (var != FR) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x60; \
break; \
case 0xbf: \
else if (var == ES2 || var == CU) \
ch = 0x5e; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xc1: \
if (var != HU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x40; \
break; \
case 0xc3: \
if (var != PT && var != PT2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0xc4: \
if (var != DE && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0xc5: \
if (var != DK && var != NO && var != NO2 && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5d; \
break; \
case 0xc6: \
if (var != DK && var != NO && var != NO2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0xc7: \
else if (var == PT || var == PT2) \
ch = 0x5c; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xc9: \
if (var == CA2) \
else if (var == SE2) \
ch = 0x40; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xd1: \
if (var != ES && var != ES2 && var != CU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5c; \
break; \
case 0xd5: \
if (var != PT && var != PT2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5d; \
break; \
case 0xd6: \
if (var != DE && var != HU && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5c; \
break; \
case 0xd8: \
if (var != DK && var != NO && var != NO2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5c; \
break; \
case 0xdc: \
else if (var == SE2) \
ch = 0x5e; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xdf: \
if (var != DE) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0xe0: \
else if (var == IT) \
ch = 0x7b; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xe1: \
if (var != HU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x60; \
break; \
case 0xe2: \
if (var != CA && var != CA2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0xe3: \
if (var != PT && var != PT2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7b; \
break; \
case 0xe4: \
if (var != DE && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7b; \
break; \
case 0xe5: \
if (var != DK && var != NO && var != NO2 && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7d; \
break; \
case 0xe6: \
if (var != DK && var != NO && var != NO2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7b; \
break; \
case 0xe7: \
else if (var == PT || var == PT2) \
ch = 0x7c; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xe8: \
if (var != CA && var != CA2 && var != IT && var != FR && var != FR1) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7d; \
break; \
case 0xe9: \
else if (var == SE2) \
ch = 0x60; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xea: \
if (var != CA && var != CA2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5d; \
break; \
case 0xec: \
if (var != IT) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0xee: \
if (var != CA) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5e; \
break; \
case 0xf1: \
if (var != ES && var != ES2 && var != CU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7c; \
break; \
case 0xf2: \
if (var != IT) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7c; \
break; \
case 0xf4: \
if (var != CA && var != CA2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x60; \
break; \
case 0xf5: \
if (var != PT && var != PT2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7d; \
break; \
case 0xf6: \
if (var != DE && var != HU && var != SE && var != SE2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7c; \
break; \
case 0xf8: \
if (var != DK && var != NO && var != NO2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7c; \
break; \
case 0xf9: \
else if (var == IT) \
ch = 0x60; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0xfb: \
if (var != CA && var != CA2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0xfc: \
else if (var == SE2) \
ch = 0x7e; \
else \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
break; \
case 0x160: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0x106: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5d; \
break; \
case 0x107: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7d; \
break; \
case 0x10c: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5e; \
break; \
case 0x10d: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0x110: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5c; \
break; \
case 0x111: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7c; \
break; \
case 0x161: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7b; \
break; \
case 0x17d: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x40; \
break; \
case 0x17e: \
if (var != YU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x60; \
break; \
case 0x2dd: \
if (var != HU) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0x2022: \
if (var != ES2) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x40; \
break; \
case 0x203e: \
if (var != GB && var != CN && var != JP && var != NO && var != SE) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x7e; \
break; \
case 0x20a9: \
if (var != KR) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5c; \
break; \
case 0x2329: \
if (var != JP_OCR_B) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5b; \
break; \
case 0x232a: \
if (var != JP_OCR_B) \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
ch = 0x5d; \
break; \
default: \
if (__glibc_unlikely (ch > 0x7f)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
- failure = __GCONV_ILLEGAL_INPUT; \
+ failure = __gconv_mark_illegal_input (step_data); \
} \
break; \
} \
surrogates pass through, attackers could make a security \
hole exploit by synthesizing any desired plane 1-16 \
character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
inptr += 4; \
We must catch this. If we let surrogates pass through, \
attackers could make a security hole exploit by \
synthesizing any desired plane 1-16 character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
inptr += 4; \
We must catch this. If we let surrogates pass through, \
attackers could make a security hole exploit by \
generating "irregular UTF-32" sequences. */ \
- result = __GCONV_ILLEGAL_INPUT; \
+ result = __gconv_mark_illegal_input (step_data); \
if (! ignore_errors_p ()) \
break; \
inptr += 4; \
git://sourceware.org / glibc.git / commitdiff