Support cross-compilation of <wctype.h>.

[gnulib.git] / lib / uniconv / u-conv-to-enc.h

diff --git a/lib/uniconv/u-conv-to-enc.h b/lib/uniconv/u-conv-to-enc.h
index b69a2b7..68ff814 100644 (file)
--- a/lib/uniconv/u-conv-to-enc.h
+++ b/lib/uniconv/u-conv-to-enc.h
@@ -106,7 +106,7 @@ FUNC (const char *tocode,
 
       iunit = 0;
       i8 = 0;
-      while (iunit < srclen)
+      while (iunit < srclen && i8 < utf8_srclen)
        {
          int countunit;
          int count8;
@@ -120,6 +120,17 @@ FUNC (const char *tocode,
          iunit += countunit;
          i8 += count8;
        }
+      /* Check that utf8_src has been traversed entirely.  */
+      if (i8 < utf8_srclen)
+       abort ();
+      /* Check that src has been traversed entirely, except possibly for an
+        incomplete sequence of units at the end.  */
+      if (iunit < srclen)
+       {
+         offsets[iunit] = *lengthp;
+         if (!(U_MBLEN (src + iunit, srclen - iunit) < 0))
+           abort ();
+       }
       free (scaled_offsets);
     }
   if (utf8_src != tmpbuf)