shared: utf8 - support decoding the full utf16

We originally only supported the BMP (i.e., we treated UTF-16 as UCS-2).

diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index ab57f4276b038734f6c65a6e39b41b954c90502f..013c110f07c072426615bd3b9f226038b2605d49 100644 (file)
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -310,12 +310,42 @@ char *utf16_to_utf8(const void *s, size_t length) {
         const uint8_t *f;
         char *r, *t;
 
         const uint8_t *f;
         char *r, *t;
 

-        r = new(char, (length*3+1)/2 + 1);
+        r = new(char, (length * 4 + 1) / 2 + 1);

         if (!r)
                 return NULL;
 
         if (!r)
                 return NULL;
 

-        for (f = s, t = r; f < (const uint8_t*) s + length; f += 2)
-                t += utf8_encode_unichar(t, (f[1] << 8) | f[0]);
+        f = s;
+        t = r;
+
+        while (f < (const uint8_t*) s + length) {
+                uint16_t w1, w2;
+
+                /* see RFC 2781 section 2.2 */
+
+                w1 = f[1] << 8 | f[0];
+                f += 2;
+
+                if (!utf16_is_surrogate(w1)) {
+                        t += utf8_encode_unichar(t, w1);
+
+                        continue;
+                }
+
+                if (utf16_is_trailing_surrogate(w1))
+                        continue;
+                else if (f >= (const uint8_t*) s + length)
+                        break;
+
+                w2 = f[1] << 8 | f[0];
+                f += 2;
+
+                if (!utf16_is_trailing_surrogate(w2)) {
+                        f -= 2;
+                        continue;
+                }
+
+                t += utf8_encode_unichar(t, utf16_surrogate_pair_to_unichar(w1, w2));
+        }

 
         *t = 0;
         return r;
 
         *t = 0;
         return r;

diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index 3d5a4c3a9c0c2e81db9bcd973cddf4d07591f3bf..77f663438e9c3465c4a1695b5879f41ba8fa3823 100644 (file)
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -41,3 +41,15 @@ char *utf16_to_utf8(const void *s, size_t length);
 
 int utf8_encoded_valid_unichar(const char *str);
 int utf8_encoded_to_unichar(const char *str);
 
 int utf8_encoded_valid_unichar(const char *str);
 int utf8_encoded_to_unichar(const char *str);

+
+static inline bool utf16_is_surrogate(uint16_t c) {
+        return (0xd800 <= c && c <= 0xdfff);
+}
+
+static inline bool utf16_is_trailing_surrogate(uint16_t c) {
+        return (0xdc00 <= c && c <= 0xdfff);
+}
+
+static inline uint32_t utf16_surrogate_pair_to_unichar(uint16_t lead, uint16_t trail) {
+                return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000;
+}

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index 3399f2ba9c1ee9d4c024b9a9a610c68b78f3096d..befa38575413be679cad5e2ec151e911a2549810 100644 (file)
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -93,6 +93,18 @@ static void test_utf8_escaping_printable(void) {
         assert_se(utf8_is_valid(p6));
 }
 
         assert_se(utf8_is_valid(p6));
 }
 

+static void test_utf16_to_utf8(void) {
+        char *a = NULL;
+        const uint16_t utf16[] = { 'a', 0xd800, 'b', 0xdc00, 'c', 0xd801, 0xdc37 };
+        const char utf8[] = { 'a', 'b', 'c', 0xf0, 0x90, 0x90, 0xb7, 0 };
+
+        a = utf16_to_utf8(utf16, 14);
+        assert_se(a);
+        assert_se(streq(a, utf8));
+
+        free(a);
+}
+

 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();
 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();


@@ -100,6 +112,7 @@ int main(int argc, char *argv[]) {
         test_utf8_encoded_valid_unichar();
         test_utf8_escaping();
         test_utf8_escaping_printable();
         test_utf8_encoded_valid_unichar();
         test_utf8_escaping();
         test_utf8_escaping_printable();

+        test_utf16_to_utf8();

 
         return 0;
 }
 
         return 0;
 }