From: Bruno Haible <bruno@clisp.org>
Date: Sat, 9 Jan 2010 22:30:20 +0000 (+0100)
Subject: unistr/u16-to-u8: Reject invalid input.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03c8d5562c251bfa6850372bb68d8eb346205f8;p=pspp

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

diff --git a/ChangeLog b/ChangeLog
index f722570dbb..5c135c300a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-09  Bruno Haible  <bruno@clisp.org>
 
+	unistr/u16-to-u8: Reject invalid input.
+	* lib/unistr/u16-to-u8.c (u16_to_u8): Call u16_mbtoucr instead of
+	u16_mbtouc.
+	* modules/unistr/u16-to-u8 (Depends-on): Add unistr/u16-mbtoucr.
+	Remove unistr/u16-mbtouc.
+
 	unistr/u8-to-u32: Reject invalid input.
 	* lib/unistr/u8-to-u32.c (u8_to_u32): Call u8_mbtoucr instead of
 	u8_mbtouc.
diff --git a/lib/unistr/u16-to-u8.c b/lib/unistr/u16-to-u8.c
index 6d8c322735..f92cc9305c 100644
--- a/lib/unistr/u16-to-u8.c
+++ b/lib/unistr/u16-to-u8.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-u8 b/modules/unistr/u16-to-u8
index 7fc8dba003..a9bd312b2f 100644
--- a/modules/unistr/u16-to-u8
+++ b/modules/unistr/u16-to-u8
@@ -6,7 +6,7 @@ lib/unistr/u16-to-u8.c
 
 Depends-on:
 unistr/base
-unistr/u16-mbtouc
+unistr/u16-mbtoucr
 unistr/u8-uctomb
 
 configure.ac: