From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Mon, 9 Jan 2023 13:26:23 +0000 (+0000)
Subject: lib-fts: More fixes for address tokenizer to handle large input properly
X-Git-Tag: 2.4.0~3234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66153d79eac43986281353b4c91ee6f3cadd1105;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts: More fixes for address tokenizer to handle large input properly
---

diff --git a/src/lib-fts/fts-tokenizer-address.c b/src/lib-fts/fts-tokenizer-address.c
index 1a2fb3d24f..b5c03f73ec 100644
--- a/src/lib-fts/fts-tokenizer-address.c
+++ b/src/lib-fts/fts-tokenizer-address.c
@@ -324,6 +324,10 @@ fts_tokenizer_email_address_next(struct fts_tokenizer *_tok,
 			/* no part of address found yet. remove possible
 			   earlier data */
 			str_truncate(tok->last_word, 0);
+                        if (fts_tokenizer_address_parent_data(tok, token_r)) {
+                               *skip_r = pos;
+                               return 1;
+                        }
 
 			/* fall through */
 		case EMAIL_ADDRESS_PARSER_STATE_LOCALPART: