From: Timo Sirainen <tss@iki.fi>
Date: Wed, 28 Mar 2012 22:58:35 +0000 (+0300)
Subject: fts-solr: Added assert + minor code cleanup
X-Git-Tag: 2.1.4~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84aac2d5c31bc55dff4e5d3421f5aacf403d362d;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: Added assert + minor code cleanup
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 22a9ddcca8..f9d86eb49c 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -511,10 +511,11 @@ fts_backend_solr_update_build_more(struct fts_backend_update_context *_ctx,
 						  SOLR_CMDBUF_FLUSH_SIZE -
 						  str_len(ctx->cmd));
 			i_assert(len > 0);
+			i_assert(len <= size);
 			data += len;
 			size -= len;
 		}
-		xml_encode_data(ctx->cur_value, data, size);
+		xml_encode_data(ctx->cmd, data, size);
 	} else {
 		xml_encode_data(ctx->cur_value, data, size);
 		if (ctx->cur_value2 != NULL)