Wrong upper bound for surrogate pairs

emweb · Mar 28, 2017 · 507418b · 507418b
1 parent 009599d
commit 507418b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Wt/WStringUtil.C b/src/Wt/WStringUtil.C
@@ -208,7 +208,7 @@ std::wstring fromUTF8(const std::string& s)
 	    cp |= ((unsigned char)s[i+j]) & 0x3F;
 	  }
 
-          if (cp >= 0xD800 && cp < 0xF000)
+          if (cp >= 0xD800 && cp < 0xE000)
             legal = false;
           else if (sizeof(wchar_t) == 4)
             result += (wchar_t)cp;
@@ -241,7 +241,7 @@ std::wstring fromUTF8(const std::string& s)
 	    cp |= ((unsigned char)s[i+j]) & 0x3F;
 	  }
 
-          if (cp >= 0xD800 && cp < 0xF000)
+          if (cp >= 0xD800 && cp < 0xE000)
             legal = false;
           else if (sizeof(wchar_t) == 4)
             result += (wchar_t)cp;
@@ -267,7 +267,7 @@ std::wstring fromUTF8(const std::string& s)
 	    cp |= ((unsigned char)s[i+j]) & 0x3F;
 	  }
 
-          if (cp >= 0xD800 && cp < 0xF000)
+          if (cp >= 0xD800 && cp < 0xE000)
             legal = false;
           else if (sizeof(wchar_t) == 4)
             result += (wchar_t)cp;