commit 38ce08cc314ef148271f8b43e4de1e7b2757f93a
author Stuart McCulloch <mcculls@gmail.com> Mon Mar 16 02:13:12 2015 +0000
committer Stuart McCulloch <mcculls@gmail.com> Mon Mar 16 02:13:19 2015 +0000
tree b27926c3689d012aa2575b76f91cac2b1098acd5
parent b02dfd0e5ccda7088ccec0445102a1923552df6b

Bug 461943: handle multi-byte characters when decoding file URLs (simplify logic)

org.eclipse.sisu.inject/src/org/eclipse/sisu/space/FileEntryIterator.java

diff --git a/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/FileEntryIterator.java b/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/FileEntryIterator.java
index 798e856..b6838e0 100644
--- a/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/FileEntryIterator.java
+++ b/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/FileEntryIterator.java
@@ -113,24 +113,16 @@
                     {
                         buf.append( (char) ( hi << 4 | lo ) );
                     }
-                    else if ( hi == 12 || hi == 13 )
+                    else if ( hi >= 12 )
                     {
-                        codePoint = ( hi == 12 ? lo : 0x10 | lo ) << 6;
-                        expectBytes = 1;
-                    }
-                    else if ( hi == 14 )
-                    {
-                        codePoint = lo << 12;
-                        expectBytes = 2;
-                    }
-                    else if ( hi == 15 )
-                    {
-                        codePoint = lo << 18;
-                        expectBytes = 3;
+                        // prepare multi-byte UTF-8 sequence
+                        expectBytes = 12 == hi ? 1 : hi - 12;
+                        codePoint = ( 13 == hi ? 0x10 + lo : lo ) << 6 * expectBytes;
                     }
                     else if ( expectBytes > 0 )
                     {
-                        codePoint |= ( ( hi & 0x3 ) << 4 | lo ) << 6 * --expectBytes;
+                        // update multi-byte UTF-8 sequence
+                        codePoint |= ( ( 0x03 & hi ) << 4 | lo ) << 6 * --expectBytes;
                         if ( expectBytes <= 0 )
                         {
                             buf.appendCodePoint( codePoint );