From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 28 Jan 2021 15:01:38 +0000 (+0200)
Subject: lib-mail: message-snippet - Stop building snippet on first non-empty part
X-Git-Tag: 2.3.14.rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58b6e2f118af90d6563b648b0147cb4bf1be987c;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message-snippet - Stop building snippet on first non-empty part

When we have gotten some snippet out of first eligible part,
we can stop.
---

diff --git a/src/lib-mail/message-snippet.c b/src/lib-mail/message-snippet.c
index 4cd55f16c7..2982e2eece 100644
--- a/src/lib-mail/message-snippet.c
+++ b/src/lib-mail/message-snippet.c
@@ -166,6 +166,12 @@ int message_snippet_generate(struct istream *input,
 			if (block.hdr != NULL)
 				continue;
 
+			/* We already have a snippet, don't look for more in
+			   subsequent parts. */
+			if (ctx.snippet.snippet->used != 0 ||
+			    ctx.quoted_snippet.snippet->used != 0)
+				break;
+
 			skip_part = NULL;
 
 			/* end of headers - verify that we can use this