From: Timo Sirainen <tss@iki.fi>
Date: Mon, 23 Aug 2010 19:15:06 +0000 (+0100)
Subject: fts-solr: Fixes to previous data encoding changes.
X-Git-Tag: 2.0.1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49215f4b573620a9c1263be617dff5d31b531f5b;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: Fixes to previous data encoding changes.
Patch by Erik Hetzner
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 981277b47c..17050ee460 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -123,9 +123,9 @@ xml_encode_data(string_t *dest, const unsigned char *data, unsigned int len)
 				/* make sure the character is valid for XML
 				   so we don't get XML parser errors */
 				unsigned int char_len =
-					uni_utf8_char_bytes(data[0]);
+					uni_utf8_char_bytes(data[i]);
 				if (i + char_len <= len &&
-				    uni_utf8_get_char_n(data, len, &chr) == 0 &&
+				    uni_utf8_get_char_n(data + i, char_len, &chr) == 1 &&
 				    is_valid_xml_char(chr))
 					str_append_n(dest, data + i, char_len);
 				else {
@@ -138,7 +138,6 @@ xml_encode_data(string_t *dest, const unsigned char *data, unsigned int len)
 			}
 			break;
 		}
-		i += uni_utf8_char_bytes(data[0]);
 	}
 }