Imported Upstream version 0.19.7

[platform/upstream/fribidi.git] / charset / fribidi-char-sets-utf8.c

diff --git a/charset/fribidi-char-sets-utf8.c b/charset/fribidi-char-sets-utf8.c
index 95a7628..dac66b3 100644 (file)
--- a/charset/fribidi-char-sets-utf8.c
+++ b/charset/fribidi-char-sets-utf8.c
@@ -65,13 +65,22 @@ fribidi_utf8_to_unicode (
          *us++ = ((*s & 0x1f) << 6) + (*(s + 1) & 0x3f);
          s += 2;
        }
-      else                     /* 3 byte */
+      else if (ch <= 0xef)     /* 3 byte */
        {
          *us++ =
            ((int) (*s & 0x0f) << 12) +
            ((*(s + 1) & 0x3f) << 6) + (*(s + 2) & 0x3f);
          s += 3;
        }
+      else                     /* 4 byte */
+      {
+         *us++ =
+           ((int) (*s & 0x07) << 18) +
+           ((*(s + 1) & 0x3f) << 12) +
+           ((*(s + 2) & 0x3f) << 6) +
+           ((*(s + 3) & 0x3f) << 0);
+         s += 4;
+      }
       length++;
     }
   return (length);