dovecot-2.2: fts: Fixed assert-crash if fts-parser was created f...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/128115b3807c
changeset: 18365:128115b3807c
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Mar 18 13:43:35 2015 +0200
description:
fts: Fixed assert-crash if fts-parser was created for a body part that backend didn't want to index.

diffstat:

 src/plugins/fts/fts-build-mail.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 3546457ae3fb -r 128115b3807c src/plugins/fts/fts-build-mail.c
--- a/src/plugins/fts/fts-build-mail.c	Tue Mar 17 17:30:33 2015 +0200
+++ b/src/plugins/fts/fts-build-mail.c	Wed Mar 18 13:43:35 2015 +0200
@@ -184,7 +184,12 @@
 	}
 	key.body_content_type = content_type;
 	key.body_content_disposition = ctx->content_disposition;
-	return fts_backend_update_set_build_key(ctx->update_ctx, &key);
+	if (!fts_backend_update_set_build_key(ctx->update_ctx, &key)) {
+		if (ctx->body_parser != NULL)
+			(void)fts_parser_deinit(&ctx->body_parser);
+		return FALSE;
+	}
+	return TRUE;
 }
 
 static int fts_build_body_block(struct fts_mail_build_context *ctx,