lib-smtp: smtp-command-parser - Fix infinite loop occurring when command stream ends...

Broken by 8f08f1944be438a2422b604c08e5060b5c7bd72f.

diff --git a/src/lib-smtp/smtp-command-parser.c b/src/lib-smtp/smtp-command-parser.c
index 4fd6bd59e97c0559168c9b6e8425fbf46d3ab2ec..f44387ddf5f9d3a0c1d8181fdd91f5c18b6ea4a5 100644 (file)
--- a/src/lib-smtp/smtp-command-parser.c
+++ b/src/lib-smtp/smtp-command-parser.c
@@ -169,6 +169,7 @@ static int smtp_command_parse_parameters(struct smtp_command_parser *parser)
        uoff_t max_size = (parser->auth_response ?
                parser->limits.max_auth_size :
                parser->limits.max_parameters_size);
+       int nch = 1;
 
        /* We assume parameters to match textstr (HT, SP, Printable US-ASCII).
           For command parameters, we also accept valid UTF-8 characters.
@@ -176,7 +177,6 @@ static int smtp_command_parse_parameters(struct smtp_command_parser *parser)
        p = parser->cur + parser->state.poff;
        while (p < parser->end) {
                unichar_t ch;
-               int nch = 1;
 
                if (parser->auth_response)
                        ch = *p;
@@ -184,6 +184,8 @@ static int smtp_command_parse_parameters(struct smtp_command_parser *parser)
                        nch = uni_utf8_get_char_n(p, (size_t)(p - parser->end),
                                                  &ch);
                }
+               if (nch == 0)
+                       break;
                if (nch < 0) {
                        smtp_command_parser_error(parser,
                                SMTP_COMMAND_PARSE_ERROR_BAD_COMMAND,
@@ -204,7 +206,7 @@ static int smtp_command_parse_parameters(struct smtp_command_parser *parser)
                return -1;
        }
        parser->state.poff = p - parser->cur;
-       if (p == parser->end)
+       if (p == parser->end || nch == 0)
                return 0;
 
        /* In the interest of improved interoperability, SMTP receivers SHOULD