Use "surrogates" instead of "category Cs"

The former is easier to understand.
QubesOS · Jan 31, 2023 · f3906b1 · f3906b1
1 parent 039273c
commit f3906b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gentbl.py b/gentbl.py
@@ -4,7 +4,8 @@ def print_interval(interval, last_cat):
         if last_cat == 'Cn':
             return
         if interval[0] != interval[1]:
-            print(f'    case 0x{interval[0]:X} ... 0x{interval[1]:X}: // category {last_cat}')
+            print(f'    case 0x{interval[0]:X} ... 0x{interval[1]:X}: // category {last_cat}'
+                  .replace('category Cs', 'surrogates'))
         else:
             print(f'    case 0x{interval[0]:X}: // category {last_cat}')
     import sys

diff --git a/qrexec-lib/unpack.c b/qrexec-lib/unpack.c
@@ -263,7 +263,7 @@ static int validate_utf8_char(const unsigned char *untrusted_c) {
     case 0x2060 ... 0x2064: // category Cf
     case 0x2066 ... 0x206F: // category Cf
     case 0x3000: // category Zs
-    case 0xD800 ... 0xDFFF: // category Cs
+    case 0xD800 ... 0xDFFF: // surrogates
     case 0xE000 ... 0xF8FF: // category Co
     case 0xFEFF: // category Cf
     case 0xFFF9 ... 0xFFFB: // category Cf