From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 9 Aug 2008 21:38:21 +0000 (+0000)
Subject: more strict UTF-8 validity checks, as it should be (patch #9847)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/03a0d5845160f5e890db47e09fcdba8e79546c4a?ds=inline

more strict UTF-8 validity checks, as it should be (patch #9847)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/stringops.cpp b/src/common/stringops.cpp
index b4959f846c..9ccd34d95c 100644
--- a/src/common/stringops.cpp
+++ b/src/common/stringops.cpp
@@ -131,7 +131,16 @@ bool wxStringOperationsUtf8::IsValidUtf8String(const char *str, size_t len)
             if ( !(b >= 0x80 && b <= 0xBF ) )
                 return false;
         }
-        else if ( b <= 0xEF ) // E1..EF
+        else if ( b == 0xED )
+        {
+            b = *(++c);
+            if ( !(b >= 0x80 && b <= 0x9F ) )
+                return false;
+            b = *(++c);
+            if ( !(b >= 0x80 && b <= 0xBF ) )
+                return false;
+        }
+        else if ( b <= 0xEF ) // E1..EC EE..EF
         {
             for ( int i = 0; i < 2; ++i )
             {