|
 |
b62b43 |
diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c
|
|
|
b62b43 |
index 011dea9050..8baf622e59 100644
|
|
|
b62b43 |
--- a/src/lib-mail/message-parser.c
|
|
|
b62b43 |
+++ b/src/lib-mail/message-parser.c
|
|
|
b62b43 |
@@ -138,6 +138,7 @@ message_part_append(struct message_parser_ctx *ctx)
|
|
|
b62b43 |
struct message_part *parent = ctx->part;
|
|
|
b62b43 |
struct message_part *part;
|
|
|
b62b43 |
|
|
|
b62b43 |
+ i_assert(!ctx->preparsed);
|
|
|
b62b43 |
i_assert(parent != NULL);
|
|
|
b62b43 |
i_assert((parent->flags & (MESSAGE_PART_FLAG_MULTIPART |
|
|
|
b62b43 |
MESSAGE_PART_FLAG_MESSAGE_RFC822)) != 0);
|
|
|
b62b43 |
@@ -171,12 +172,14 @@ static void message_part_finish(struct message_parser_ctx *ctx)
|
|
|
b62b43 |
{
|
|
|
b62b43 |
struct message_part **const *parent_next_partp;
|
|
|
b62b43 |
|
|
|
b62b43 |
- i_assert(ctx->nested_parts_count > 0);
|
|
|
b62b43 |
- ctx->nested_parts_count--;
|
|
|
b62b43 |
+ if (!ctx->preparsed) {
|
|
|
b62b43 |
+ i_assert(ctx->nested_parts_count > 0);
|
|
|
b62b43 |
+ ctx->nested_parts_count--;
|
|
|
b62b43 |
|
|
|
b62b43 |
- parent_next_partp = array_back(&ctx->next_part_stack);
|
|
|
b62b43 |
- array_pop_back(&ctx->next_part_stack);
|
|
|
b62b43 |
- ctx->next_part = *parent_next_partp;
|
|
|
b62b43 |
+ parent_next_partp = array_back(&ctx->next_part_stack);
|
|
|
b62b43 |
+ array_pop_back(&ctx->next_part_stack);
|
|
|
b62b43 |
+ ctx->next_part = *parent_next_partp;
|
|
|
b62b43 |
+ }
|
|
|
b62b43 |
|
|
|
b62b43 |
message_size_add(&ctx->part->parent->body_size, &ctx->part->body_size);
|
|
|
b62b43 |
message_size_add(&ctx->part->parent->body_size, &ctx->part->header_size);
|
|
|
b62b43 |
diff --git a/src/lib-mail/test-message-parser.c b/src/lib-mail/test-message-parser.c
|
|
|
b62b43 |
index 13984f939e..a00f0d6200 100644
|
|
|
b62b43 |
--- a/src/lib-mail/test-message-parser.c
|
|
|
b62b43 |
+++ b/src/lib-mail/test-message-parser.c
|
|
|
b62b43 |
@@ -178,9 +178,10 @@ static void test_message_parser_small_blocks(void)
|
|
|
b62b43 |
static void test_message_parser_stop_early(void)
|
|
|
b62b43 |
{
|
|
|
b62b43 |
struct message_parser_ctx *parser;
|
|
|
b62b43 |
- struct istream *input;
|
|
|
b62b43 |
+ struct istream *input, *input2;
|
|
|
b62b43 |
struct message_part *parts;
|
|
|
b62b43 |
struct message_block block;
|
|
|
b62b43 |
+ const char *error;
|
|
|
b62b43 |
unsigned int i;
|
|
|
b62b43 |
pool_t pool;
|
|
|
b62b43 |
int ret;
|
|
|
b62b43 |
@@ -198,6 +199,24 @@ static void test_message_parser_stop_early(void)
|
|
|
b62b43 |
&block)) > 0) ;
|
|
|
b62b43 |
test_assert(ret == 0);
|
|
|
b62b43 |
message_parser_deinit(&parser, &parts;;
|
|
|
b62b43 |
+
|
|
|
b62b43 |
+ /* test preparsed - first re-parse everything with a stream
|
|
|
b62b43 |
+ that sees EOF at this position */
|
|
|
b62b43 |
+ input2 = i_stream_create_from_data(test_msg, i);
|
|
|
b62b43 |
+ parser = message_parser_init(pool, input2, &set_empty);
|
|
|
b62b43 |
+ while ((ret = message_parser_parse_next_block(parser,
|
|
|
b62b43 |
+ &block)) > 0) ;
|
|
|
b62b43 |
+ test_assert(ret == -1);
|
|
|
b62b43 |
+ message_parser_deinit(&parser, &parts;;
|
|
|
b62b43 |
+
|
|
|
b62b43 |
+ /* now parse from the parts */
|
|
|
b62b43 |
+ i_stream_seek(input2, 0);
|
|
|
b62b43 |
+ parser = message_parser_init_from_parts(parts, input2, &set_empty);
|
|
|
b62b43 |
+ while ((ret = message_parser_parse_next_block(parser,
|
|
|
b62b43 |
+ &block)) > 0) ;
|
|
|
b62b43 |
+ test_assert(ret == -1);
|
|
|
b62b43 |
+ test_assert(message_parser_deinit_from_parts(&parser, &parts, &error) == 0);
|
|
|
b62b43 |
+ i_stream_unref(&input2);
|
|
|
b62b43 |
}
|
|
|
b62b43 |
|
|
|
b62b43 |
i_stream_unref(&input);
|