AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ucs4_internal_loop): Don't handle errors when transliterating. (ucs4_internal_loop_unaligned): Likewise. (ucs4le_internal_loop): Likewise. (ucs4le_internal_loop_unaligned): Likewise.

Browse Source
This commit is contained in:
Ulrich Drepper 2000-08-25 22:06:25 +00:00
parent c7f524b8af
commit 0cdb4983fc
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
iconv/gconv_simple.c
View File

@ -239,6 +239,10 @@ ucs4_internal_loop (struct __gconv_step *step,
this is not an error because of the lack of possibilities to this is not an error because of the lack of possibilities to
represent the result. This is a genuine bug in the input since represent the result. This is a genuine bug in the input since
UCS4 does not allow such values. */ UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
return __GCONV_ILLEGAL_INPUT;
if (flags & __GCONV_IGNORE_ERRORS) if (flags & __GCONV_IGNORE_ERRORS)
{ {
/* Just ignore this character. */ /* Just ignore this character. */
@ -292,6 +296,10 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step,
this is not an error because of the lack of possibilities to this is not an error because of the lack of possibilities to
represent the result. This is a genuine bug in the input since represent the result. This is a genuine bug in the input since
UCS4 does not allow such values. */ UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
return __GCONV_ILLEGAL_INPUT;
if (flags & __GCONV_IGNORE_ERRORS) if (flags & __GCONV_IGNORE_ERRORS)
{ {
/* Just ignore this character. */ /* Just ignore this character. */
@ -582,6 +590,10 @@ ucs4le_internal_loop (struct __gconv_step *step,
this is not an error because of the lack of possibilities to this is not an error because of the lack of possibilities to
represent the result. This is a genuine bug in the input since represent the result. This is a genuine bug in the input since
UCS4 does not allow such values. */ UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
return __GCONV_ILLEGAL_INPUT;
if (flags & __GCONV_IGNORE_ERRORS) if (flags & __GCONV_IGNORE_ERRORS)
{ {
/* Just ignore this character. */ /* Just ignore this character. */
@ -633,6 +645,10 @@ ucs4le_internal_loop_unaligned (struct __gconv_step *step,
this is not an error because of the lack of possibilities to this is not an error because of the lack of possibilities to
represent the result. This is a genuine bug in the input since represent the result. This is a genuine bug in the input since
UCS4 does not allow such values. */ UCS4 does not allow such values. */
if (irreversible == NULL)
/* We are transliterating, don't try to correct anything. */
return __GCONV_ILLEGAL_INPUT;
if (flags & __GCONV_IGNORE_ERRORS) if (flags & __GCONV_IGNORE_ERRORS)
{ {
/* Just ignore this character. */ /* Just ignore this character. */
@ -958,7 +974,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
continue; \ continue; \
} \ } \
\ \
if (__builtin_expect (inptr + cnt > inend, 0)) \ if (__builtin_expect (inptr + cnt > inend, 0)) \
{ \ { \
/* We don't have enough input. But before we report that check \ /* We don't have enough input. But before we report that check \
that all the bytes are correct. */ \ that all the bytes are correct. */ \
@ -972,7 +988,6 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
break; \ break; \
} \ } \
\ \
/* This is an illegal character. */ \
if (ignore_errors_p ()) \ if (ignore_errors_p ()) \
{ \ { \
/* Ignore it. */ \ /* Ignore it. */ \