Consider non-character as valid unicode

Fix #1045
fcitx · May 8, 2024 · b343fb5 · b343fb5
1 parent a2a66aa
commit b343fb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/fcitx-utils/cutf8.cpp b/src/lib/fcitx-utils/cutf8.cpp
@@ -27,8 +27,7 @@
                                             : ((Char) < 0x4000000 ? 5 : 6)))))
 
 #define UNICODE_VALID(Char)                                                    \
-    ((Char) < 0x110000 && (((Char) & 0xFFFFF800) != 0xD800) &&                 \
-     ((Char) < 0xFDD0 || (Char) > 0xFDEF) && ((Char) & 0xFFFE) != 0xFFFE)
+    ((Char) < 0x110000 && (((Char) & 0xFFFFF800) != 0xD800))
 
 size_t fcitx_utf8_strlen(const char *s) {
     size_t l = 0;

diff --git a/src/lib/fcitx-utils/utf8.cpp b/src/lib/fcitx-utils/utf8.cpp
@@ -11,9 +11,7 @@
 namespace fcitx::utf8 {
 
 bool UCS4IsValid(uint32_t code) {
-    return ((code) < 0x110000 && (((code) & 0xFFFFF800) != 0xD800) &&
-            ((code) < 0xFDD0 || (code) > 0xFDEF) &&
-            ((code) & 0xFFFE) != 0xFFFE);
+    return ((code) < 0x110000 && (((code) & 0xFFFFF800) != 0xD800));
 }
 
 std::string UCS4ToUTF8(uint32_t code) {

diff --git a/test/testutf8.cpp b/test/testutf8.cpp
@@ -85,7 +85,10 @@ int main() {
 
     FCITX_ASSERT(counter == 7);
 
-    FCITX_ASSERT(!fcitx::utf8::UCS4IsValid(0xfdd7));
+    FCITX_ASSERT(fcitx::utf8::UCS4IsValid(0xfdd7));
+    FCITX_ASSERT(fcitx::utf8::UCS4IsValid(0xffff));
+    FCITX_ASSERT(!fcitx::utf8::UCS4IsValid(0x200000));
+
 
     return 0;
 }