From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 14 Dec 2017 19:26:28 +0000 (+0200)
Subject: fts: Add assert to make sure fts_parser.deinit() returns retriable_error_msg when... 
X-Git-Tag: 2.3.0.rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c18fa75b5a1feebde68986bc7f9bc19f0afe59;p=thirdparty%2Fdovecot%2Fcore.git

fts: Add assert to make sure fts_parser.deinit() returns retriable_error_msg when needed
---

diff --git a/src/plugins/fts/fts-parser.c b/src/plugins/fts/fts-parser.c
index 98df61bd90..47c5f6d2b3 100644
--- a/src/plugins/fts/fts-parser.c
+++ b/src/plugins/fts/fts-parser.c
@@ -99,9 +99,15 @@ int fts_parser_deinit(struct fts_parser **_parser, const char **retriable_err_ms
 	*_parser = NULL;
 
 	buffer_free(&parser->utf8_output);
-	if (parser->v.deinit != NULL)
-		ret = parser->v.deinit(parser, retriable_err_msg_r);
-	else
+	if (parser->v.deinit != NULL) {
+		const char *error = NULL;
+		ret = parser->v.deinit(parser, &error);
+		if (ret == 0) {
+			i_assert(error != NULL);
+			if (retriable_err_msg_r != NULL)
+				*retriable_err_msg_r = error;
+		}
+	} else
 		i_free(parser);
 	return ret;
 }