lib-mail: mail-html2text - Validate UCS4 codepoint

Fixes: Panic: file unichar.c: line 160 (uni_ucs4_to_utf8_c): assertion failed: (uni_is_valid_ucs4(chr))

diff --git a/src/lib-mail/mail-html2text.c b/src/lib-mail/mail-html2text.c
index 856ec0b8c1c7c256d53b007413cf30d33274f28f..80f25393a134b292ee7ba2319aba1ae58140a199 100644 (file)
--- a/src/lib-mail/mail-html2text.c
+++ b/src/lib-mail/mail-html2text.c
@@ -133,7 +133,8 @@ static bool html_entity_get_unichar(const char *name, unichar_t *chr_r)
        if (name[0] == '#' &&
            ((name[1] == 'x' &&
              str_to_uint32_hex(name+2, &chr) == 0) ||
-            str_to_uint32(name+1, &chr) == 0)) {
+            str_to_uint32(name+1, &chr) == 0) &&
+            uni_is_valid_ucs4(chr)) {
                *chr_r = chr;
                return TRUE;
        }

diff --git a/src/lib-mail/test-mail-html2text.c b/src/lib-mail/test-mail-html2text.c
index f4bb165bbb3447fbcbf5dc6bbc87f4826f41cd89..cbb0a6630f88a624a3f3eda66f0f772f11e6cd9b 100644 (file)
--- a/src/lib-mail/test-mail-html2text.c
+++ b/src/lib-mail/test-mail-html2text.c
@@ -41,6 +41,7 @@ static const struct {
        { "aä", "a\xC3\xA4" },
        { "aä", "a\xC3\xA4" },
        { "€", "\xE2\x82\xAC" },
+       { "&#deee;", "" }, // invalid codepoint
 };
 
 static const char *test_blockquote_input =