From 98ed0b24d615ba88a1d89c4b71fc0a5da721b751 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 18 May 2015 14:53:52 +0300 Subject: [PATCH] lib-fts: Partially reverted d097a9779c37 - don't use lib_atexit() Because fts is loaded as plugin lib_atexit() is called after the plugin is already unloaded, so it crashes. --- src/lib-fts/fts-filter-normalizer-icu.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/lib-fts/fts-filter-normalizer-icu.c b/src/lib-fts/fts-filter-normalizer-icu.c index fa10040b04..e1704ad928 100644 --- a/src/lib-fts/fts-filter-normalizer-icu.c +++ b/src/lib-fts/fts-filter-normalizer-icu.c @@ -10,8 +10,6 @@ #ifdef HAVE_LIBICU #include "fts-icu.h" -#include - struct fts_filter_normalizer_icu { struct fts_filter filter; pool_t pool; @@ -24,8 +22,6 @@ struct fts_filter_normalizer_icu { string_t *utf8_token; }; -static bool icu_exit_callback_set = FALSE; - static void fts_filter_normalizer_icu_destroy(struct fts_filter *filter) { struct fts_filter_normalizer_icu *np = @@ -58,11 +54,6 @@ fts_filter_normalizer_icu_create(const struct fts_language *lang ATTR_UNUSED, } } - if (!icu_exit_callback_set) { - icu_exit_callback_set = TRUE; - lib_atexit(u_cleanup); - } - pp = pool_alloconly_create(MEMPOOL_GROWING"fts_filter_normalizer_icu", sizeof(struct fts_filter_normalizer_icu)); np = p_new(pp, struct fts_filter_normalizer_icu, 1); -- 2.47.3