unistr/u16-to-u32: Reject invalid input.

(cherry picked from commit 19aa55eaba476927ff9480bf2277b7ebb5ef9ad2)

diff --git a/ChangeLog b/ChangeLog
index e46c319..895d955 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-09  Bruno Haible  <bruno@clisp.org>
 
+       unistr/u16-to-u32: Reject invalid input.
+       * lib/unistr/u16-to-u32.c (u16_to_u32): Call u16_mbtoucr instead of
+       u16_mbtouc.
+       * modules/unistr/u16-to-u32 (Depends-on): Add unistr/u16-mbtoucr.
+       Remove unistr/u16-mbtouc.
+
        unistr/u16-to-u8: Reject invalid input.
        * lib/unistr/u16-to-u8.c (u16_to_u8): Call u16_mbtoucr instead of
        u16_mbtouc.

diff --git a/lib/unistr/u16-to-u32.c b/lib/unistr/u16-to-u32.c
index d79445b..3544cde 100644 (file)
--- a/lib/unistr/u16-to-u32.c
+++ b/lib/unistr/u16-to-u32.c
@@ -58,7 +58,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
       int count;
 
       /* Fetch a Unicode character from the input string.  */
-      count = u16_mbtouc (&uc, s, s_end - s);
+      count = u16_mbtoucr (&uc, s, s_end - s);
       if (count < 0)
         {
           if (!(result == resultbuf || result == NULL))

diff --git a/modules/unistr/u16-to-u32 b/modules/unistr/u16-to-u32
index 399ac89..bb2e488 100644 (file)
--- a/modules/unistr/u16-to-u32
+++ b/modules/unistr/u16-to-u32
@@ -6,7 +6,7 @@ lib/unistr/u16-to-u32.c
 
 Depends-on:
 unistr/base
-unistr/u16-mbtouc
+unistr/u16-mbtoucr
 
 configure.ac: