From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 23 Oct 2017 12:46:49 +0000 (+0300)
Subject: lib-fts: Fix test-fts-filter to use valid unicode
X-Git-Tag: 2.3.0.rc1~778
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0190b33c05bd72f1049255d03a7b5217ff1bbced;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts: Fix test-fts-filter to use valid unicode
---

diff --git a/src/lib-fts/test-fts-filter.c b/src/lib-fts/test-fts-filter.c
index 20920fe3c3..702a299308 100644
--- a/src/lib-fts/test-fts-filter.c
+++ b/src/lib-fts/test-fts-filter.c
@@ -655,13 +655,14 @@ static void test_fts_filter_normalizer_baddata(void)
 	struct fts_filter *norm;
 	const char *token, *error;
 	string_t *str;
-	unsigned int i;
+	unichar_t i;
 
 	test_begin("fts filter normalizer bad data");
 
 	test_assert(fts_filter_create(fts_filter_normalizer_icu, NULL, NULL, settings, &norm, &error) == 0);
 	str = t_str_new(128);
 	for (i = 1; i < 0x1ffff; i++) {
+		if (!uni_is_valid_ucs4(i)) continue;
 		str_truncate(str, 0);
 		uni_ucs4_to_utf8_c(i, str);
 		token = str_c(str);
@@ -671,7 +672,7 @@ static void test_fts_filter_normalizer_baddata(void)
 	}
 
 	str_truncate(str, 0);
-	uni_ucs4_to_utf8_c(0x7fffffff, str);
+	uni_ucs4_to_utf8_c(UNICHAR_T_MAX, str);
 	token = str_c(str);
 	test_assert(fts_filter_filter(norm, &token, &error) >= 0);