lib: punycode_decode() - Fix parsing empty string [after delimiter]

This caused an assert crash when --enable-experimental-mail-utf8 was
used and invalid punycode domain was being parsed.

Based on code by rootvector2 (Dexter.k)

diff --git a/src/lib/punycode.c b/src/lib/punycode.c
index 1c8853a8b638647a74f7c568deaed16d00c318b7..c9e03a5f8d3bcec746b243405a36c6f72814e788 100644 (file)
--- a/src/lib/punycode.c
+++ b/src/lib/punycode.c
@@ -90,6 +90,8 @@ int punycode_decode(const char *input, size_t len, string_t *output)
                ptr = delim + 1;
        else
                ptr = input;
+       if (ptr == end)
+               return -1;
 
        i_assert(ptr < end);
        while (ptr < end) {

diff --git a/src/lib/test-punycode.c b/src/lib/test-punycode.c
index 485a5cfa428b81350f419dc9470ea5c935639430..f6ed829de229f6d47aee88e664db2f03775dd6ab 100644 (file)
--- a/src/lib/test-punycode.c
+++ b/src/lib/test-punycode.c
@@ -25,6 +25,8 @@ static void test_punycode_decode(void)
                  .ret = 0 },
                /* broken */
                { .in = "zz-zzzz", .out = "", .ret = -1 },
+               { .in = "zz-", .out = "", .ret = -1 },
+               { .in = "", .out = "", .ret = -1 },
        };
 
        unsigned int i;