dovecot-2.0: fts-solr: Fixes to previous data encoding changes.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/0f6e3c9037d5
changeset: 12039:0f6e3c9037d5
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 23 20:15:06 2010 +0100
description:
fts-solr: Fixes to previous data encoding changes.
Patch by Erik Hetzner

diffstat:

 src/plugins/fts-solr/fts-backend-solr.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r f0d3d7eb0604 -r 0f6e3c9037d5 src/plugins/fts-solr/fts-backend-solr.c
--- a/src/plugins/fts-solr/fts-backend-solr.c	Mon Aug 23 19:03:05 2010 +0100
+++ b/src/plugins/fts-solr/fts-backend-solr.c	Mon Aug 23 20:15:06 2010 +0100
@@ -123,9 +123,9 @@
 				/* 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 @@
 			}
 			break;
 		}
-		i += uni_utf8_char_bytes(data[0]);
 	}
 }