X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1774c3c535957de3ba1ca85fce944767d40bdcb2..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/stringops.cpp

diff --git a/src/common/stringops.cpp b/src/common/stringops.cpp
index ae182c6cfa..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 )
             {
@@ -194,7 +203,7 @@ bool wxStringOperationsUtf8::IsValidUtf8LeadByte(unsigned char c)
 //     code in single place
 wxUniChar::Utf8CharBuffer wxUniChar::AsUTF8() const
 {
-    Utf8CharBuffer buf;
+    Utf8CharBuffer buf = { "" }; // init to avoid g++ 4.1 warning with -O2
     char *out = buf.data;
 
     value_type code = GetValue();