[PATCH 1/2] lib-managesieve: managesieve-parser - Fix handling of lone CR character

Gbp-Pq: Name 0001-lib-managesieve-managesieve-parser-Fix-handling-of-l.patch

diff --git a/pigeonhole/src/lib-managesieve/managesieve-parser.c b/pigeonhole/src/lib-managesieve/managesieve-parser.c
index 546e43181fc032ab124609caa35b8140f803f52e..3d34c1c3dc956890c171818c1797d4f0b7c57ea3 100644 (file)
--- a/pigeonhole/src/lib-managesieve/managesieve-parser.c
+++ b/pigeonhole/src/lib-managesieve/managesieve-parser.c
@@ -441,6 +441,15 @@ static bool managesieve_parser_read_arg(struct managesieve_parser *parser)
 
                switch (data[0]) {
                case '\r':
+                       if (data_size == 1) {
+                               /* Wait for LF */
+                               return FALSE;
+                       }
+                       if (data[1] != '\n') {
+                               parser->error = "CR sent without LF";
+                               return FALSE;
+                       }
+                       /* Fall through */
                case '\n':
                        /* Unexpected end of line */
                        parser->eol = TRUE;