(PREPARE_LOOP): Return __GCONV_EMPTY_INPUT only if input is really
[kopensolaris-gnu/glibc.git] / iconvdata / utf-16.c
index d39399e..b816508 100644 (file)
@@ -1,5 +1,5 @@
 /* Conversion module for UTF-16.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000-2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -51,7 +51,8 @@
        {                                                                     \
          /* We have to find out which byte order the file is encoded in.  */ \
          if (inptr + 2 > inend)                                              \
-           return __GCONV_EMPTY_INPUT;                                       \
+           return (inptr == inend                                            \
+                   ? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);        \
                                                                              \
          if (get16u (inptr) == BOM)                                          \
            /* Simply ignore the BOM character.  */                           \
@@ -205,11 +206,9 @@ gconv_end (struct __gconv_step *data)
           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;                                       \
        if (! ignore_errors_p ())                                             \
-         {                                                                   \
-           result = __GCONV_ILLEGAL_INPUT;                                   \
-           break;                                                            \
-         }                                                                   \
+         break;                                                              \
        inptr += 4;                                                           \
        ++*irreversible;                                                      \
        continue;                                                             \
@@ -217,11 +216,11 @@ gconv_end (struct __gconv_step *data)
                                                                              \
     if (swap)                                                                \
       {                                                                              \
-       if (__builtin_expect (c, 0) >= 0x10000)                               \
+       if (__builtin_expect (c >= 0x10000, 0))                               \
          {                                                                   \
-           if (__builtin_expect (c, 0) >= 0x110000)                          \
+           if (__builtin_expect (c >= 0x110000, 0))                          \
              {                                                               \
-               STANDARD_ERR_HANDLER (4);                                     \
+               STANDARD_TO_LOOP_ERR_HANDLER (4);                             \
              }                                                               \
                                                                              \
            /* Generate a surrogate character.  */                            \
@@ -241,11 +240,11 @@ gconv_end (struct __gconv_step *data)
       }                                                                              \
     else                                                                     \
       {                                                                              \
-       if (__builtin_expect (c, 0) >= 0x10000)                               \
+       if (__builtin_expect (c >= 0x10000, 0))                               \
          {                                                                   \
-           if (__builtin_expect (c, 0) >= 0x110000)                          \
+           if (__builtin_expect (c >= 0x110000, 0))                          \
              {                                                               \
-               STANDARD_ERR_HANDLER (4);                                     \
+               STANDARD_TO_LOOP_ERR_HANDLER (4);                             \
              }                                                               \
                                                                              \
            /* Generate a surrogate character.  */                            \
@@ -285,7 +284,7 @@ gconv_end (struct __gconv_step *data)
       {                                                                              \
        u1 = bswap_16 (u1);                                                   \
                                                                              \
-       if (__builtin_expect (u1, 0) < 0xd800 || u1 > 0xdfff)                 \
+       if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff)                 \
          {                                                                   \
            /* No surrogate.  */                                              \
            put32 (outptr, u1);                                               \
@@ -307,19 +306,12 @@ gconv_end (struct __gconv_step *data)
                                                                              \
            inptr += 2;                                                       \
            u2 = bswap_16 (get16 (inptr));                                    \
-           if (__builtin_expect (u2, 0xdc00) < 0xdc00                        \
-               || __builtin_expect (u2, 0xdc00) >= 0xdfff)                   \
+           if (__builtin_expect (u2 < 0xdc00, 0)                             \
+               || __builtin_expect (u2 == 0xdfff, 0))                        \
              {                                                               \
                /* This is no valid second word for a surrogate.  */          \
-               if (! ignore_errors_p ())                                     \
-                 {                                                           \
-                   inptr -= 2;                                               \
-                   result = __GCONV_ILLEGAL_INPUT;                           \
-                   break;                                                    \
-                 }                                                           \
-                                                                             \
-               ++*irreversible;                                              \
-               continue;                                                     \
+               inptr -= 2;                                                   \
+               STANDARD_FROM_LOOP_ERR_HANDLER (2);                           \
              }                                                               \
                                                                              \
            put32 (outptr, ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00));            \
@@ -328,7 +320,7 @@ gconv_end (struct __gconv_step *data)
       }                                                                              \
     else                                                                     \
       {                                                                              \
-       if (__builtin_expect (u1, 0) < 0xd800 || u1 > 0xdfff)                 \
+       if (__builtin_expect (u1 < 0xd800, 1) || u1 > 0xdfff)                 \
          {                                                                   \
            /* No surrogate.  */                                              \
            put32 (outptr, u1);                                               \
@@ -350,19 +342,12 @@ gconv_end (struct __gconv_step *data)
                                                                              \
            inptr += 2;                                                       \
            u2 = get16 (inptr);                                               \
-           if (__builtin_expect (u2, 0xdc00) < 0xdc00                        \
-               || __builtin_expect (u2, 0xdc00) >= 0xdfff)                   \
+           if (__builtin_expect (u2 < 0xdc00, 0)                             \
+               || __builtin_expect (u2 >= 0xdfff, 0))                        \
              {                                                               \
                /* This is no valid second word for a surrogate.  */          \
-               if (! ignore_errors_p ())                                     \
-                 {                                                           \
-                   inptr -= 2;                                               \
-                   result = __GCONV_ILLEGAL_INPUT;                           \
-                   break;                                                    \
-                 }                                                           \
-                                                                             \
-               ++*irreversible;                                              \
-               continue;                                                     \
+               inptr -= 2;                                                   \
+               STANDARD_FROM_LOOP_ERR_HANDLER (2);                           \
              }                                                               \
                                                                              \
            put32 (outptr, ((u1 - 0xd7c0) << 10) + (u2 - 0xdc00));            \