From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 17 Jan 2025 11:05:24 +0000 (+0000)
Subject: fts-flatcurve: fts_backend_flatcurve_deinit() - Don't crash if init failed
X-Git-Tag: 2.4.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50951b440dd31dd94bc508266742b9460ec215e4;p=thirdparty%2Fdovecot%2Fcore.git

fts-flatcurve: fts_backend_flatcurve_deinit() - Don't crash if init failed

When fts_backend_flatcurve_init() fails to find the user,
the fields are not initialized, with the exception of the event and
the preallocatd pool.
---

diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
index 6b195c1091..129fa52eac 100644
--- a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
+++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
@@ -234,6 +234,7 @@ void fts_flatcurve_xapian_deinit(struct flatcurve_fts_backend *backend)
 	struct flatcurve_xapian *x = backend->xapian;
 	const char *error;
 
+	i_assert(x != NULL);
 	x->deinit = TRUE;
 	if (hash_table_is_created(x->optimize)) {
 		struct hash_iterate_context *iter =
diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
index 3253a9c012..c1807bdc98 100644
--- a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
+++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c
@@ -68,6 +68,7 @@ int
 fts_backend_flatcurve_close_mailbox(struct flatcurve_fts_backend *backend,
 				    const char **error_r)
 {
+	i_assert(backend->boxname != NULL);
 	int ret = 0;
 	if (str_len(backend->boxname) > 0) {
 		ret = fts_flatcurve_xapian_close(backend, error_r);
@@ -98,10 +99,12 @@ static void fts_backend_flatcurve_deinit(struct fts_backend *_backend)
 	struct flatcurve_fts_backend *backend =
 		(struct flatcurve_fts_backend *)_backend;
 
-	int ret = fts_backend_flatcurve_close_mailbox(backend, &error);
-	fts_flatcurve_xapian_deinit(backend);
-	if (ret < 0)
-		e_error(backend->event, "%s", error);
+	if (backend->xapian != NULL) {
+		int ret = fts_backend_flatcurve_close_mailbox(backend, &error);
+		fts_flatcurve_xapian_deinit(backend);
+		if (ret < 0)
+			e_error(backend->event, "%s", error);
+	}
 
 	event_unref(&backend->event);
 	pool_unref(&backend->pool);