From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 25 Feb 2020 12:33:31 +0000 (+0200)
Subject: lib-mail: message-snippet - Count '>' in quoted snippet towards max_snippet_chars
X-Git-Tag: 2.3.10~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0cc3620ea249e0aa7d3384fb0e67da8ddb65d92;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message-snippet - Count '>' in quoted snippet towards max_snippet_chars
---

diff --git a/src/lib-mail/message-snippet.c b/src/lib-mail/message-snippet.c
index e108b5821b..441d03d308 100644
--- a/src/lib-mail/message-snippet.c
+++ b/src/lib-mail/message-snippet.c
@@ -143,7 +143,7 @@ int message_snippet_generate(struct istream *input,
 	ctx.snippet.snippet = str_new(pool, max_snippet_chars);
 	ctx.snippet.chars_left = max_snippet_chars;
 	ctx.quoted_snippet.snippet = str_new(pool, max_snippet_chars);
-	ctx.quoted_snippet.chars_left = max_snippet_chars;
+	ctx.quoted_snippet.chars_left = max_snippet_chars - 1; /* -1 for '>' */
 	parser = message_parser_init(pool_datastack_create(), input, 0, 0);
 	decoder = message_decoder_init(NULL, 0);
 	while ((ret = message_parser_parse_next_block(parser, &raw_block)) > 0) {
diff --git a/src/lib-mail/test-message-snippet.c b/src/lib-mail/test-message-snippet.c
index 387a107341..35289367de 100644
--- a/src/lib-mail/test-message-snippet.c
+++ b/src/lib-mail/test-message-snippet.c
@@ -84,7 +84,7 @@ static const struct {
 	{ "Content-Type: text/plain\n"
 	  "\n"
 	  ">quoted long text",
-	  6,
+	  7,
 	  ">quoted" },
 	{ "Content-Type: text/plain; charset=utf-8\n"
 	  "\n"