Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3490:937ae4aec137 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Boundary line could have been included in next message part's headers.
author Timo Sirainen <tss@iki.fi>
date Tue, 12 Jul 2005 23:45:27 +0300
parents 16db33dd1bfd
children 2dbd7232d7df
files src/lib-mail/message-parser.c
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/message-parser.c	Tue Jul 12 21:14:44 2005 +0300
+++ b/src/lib-mail/message-parser.c	Tue Jul 12 23:45:27 2005 +0300
@@ -526,7 +526,7 @@
 	struct message_boundary *boundary;
 	const unsigned char *msg;
 	size_t size;
-	int end_boundary;
+	int end_boundary, i, line_count = 1;
 
 	boundary = message_find_boundary(parser_ctx->input, boundaries,
 					 boundary_size, has_nuls);
@@ -543,6 +543,7 @@
 	}
 	if (msg[0] == '\n') {
 		msg++; size--;
+		line_count++;
 	}
 	i_assert(size >= 2 && msg[0] == '-' && msg[1] == '-');
 	msg += 2; size -= 2;
@@ -555,9 +556,12 @@
 	   change boundary_size to be the found boundary's parent part */
 	boundary_size = &boundary->part->body_size;
 
-	/* skip the rest of the line */
-	message_skip_line(parser_ctx->input, boundary_size,
-			  !end_boundary, has_nuls);
+	/* skip the rest of the line. we probably have to skip two lines
+	   because input is positioned to end of boundary's previous line */
+	for (i = 0; i < line_count; i++) {
+		message_skip_line(parser_ctx->input, boundary_size,
+				  !end_boundary, has_nuls);
+	}
 
 	if (end_boundary) {
 		/* skip the footer */