2003-03-a30 Matthias Clasen <maclas@gmx.de>

[platform/upstream/glib.git] / glib / gutf8.c

diff --git a/glib/gutf8.c b/glib/gutf8.c
index 6b01a09..9371bf1 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -97,8 +97,9 @@
 
 #define UNICODE_VALID(Char)                   \
     ((Char) < 0x110000 &&                     \
-     ((Char) < 0xD800 || (Char) >= 0xE000) && \
-     (Char) != 0xFFFE && (Char) != 0xFFFF)
+     (((Char) & 0xFFFFF800) != 0xD800) &&     \
+     ((Char) < 0xFDD0 || (Char) > 0xFDEF) &&  \
+     ((Char) & 0xFFFF) != 0xFFFF)
    
      
 static const gchar utf8_skip_data[256] = {