Stricter range checking.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d024d822513fd98b5ea84c3062c69ffa7b62365d..60021165e60ac318a5e384b383fca99b109c778b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-17  Bruno Haible  <bruno@clisp.org>
+
+       * utf8-ucs4.h (u8_mbtouc_aux): Stricter range checking.
+
 2002-02-15  Bruno Haible  <bruno@clisp.org>
 
        * config.charset [msdosdjgpp]: For Russian, use CP866.

diff --git a/lib/utf8-ucs4.h b/lib/utf8-ucs4.h
index f39c9c5e2aef4f8d77bf257da0fa6a5dff2937f2..a3f28834b4165821887764f6bf5723145336d136 100644 (file)
--- a/lib/utf8-ucs4.h
+++ b/lib/utf8-ucs4.h
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
 This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,11 @@ u8_mbtouc_aux (puc, s, n)
             {
               if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
                   && (s[3] ^ 0x80) < 0x40
-                  && (c >= 0xf1 || s[1] >= 0x90))
+                  && (c >= 0xf1 || s[1] >= 0x90)
+#if 1
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+#endif
+                 )
                 {
                   *puc = ((unsigned int) (c & 0x07) << 18)
                          | ((unsigned int) (s[1] ^ 0x80) << 12)