Changeset 324:ba58cbca64a1

Timestamp:

11/30/08 03:42:03 (1 month ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

More unicode checks

Files:

• dwt/dwthelper/utils.d (modified) (1 diff)

dwt/dwthelper/utils.d

@@ -488 +488 @@
-    }
-    else{
+        int steps = 0;
-        while(( str[index] & 0xC0 ) is 0x80 ){
-            index--;
+            steps++;
+            if( steps > 3 || index < 0 ){
+                break;
+            }
+        }
+        if((( str[index] & 0xE0 ) is 0xC0) && ( steps <= 1 )){
+            // ok
+        }
+        else if((( str[index] & 0xF0 ) is 0xE0) && ( steps <= 2 )){
+            // ok
+        }
+        else if((( str[index] & 0xF8 ) is 0xF0) && ( steps <= 3 )){
+            // ok
+        }
+        else{
+            tango.text.convert.Utf.onUnicodeError( "invalid utf8 input to toAbsoluteCodePointStartOffset" );
-        }
-        return index;