Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -458,11 +458,11 @@
 			if (buf[i] == '-') {
 				size_t cache_len;
 
 				[cache appendCString: buf + last
 					  withLength: i - last];
-				cache_len = [cache cStringLength];
+				cache_len = [cache length];
 
 				pool = [[OFAutoreleasePool alloc] init];
 				[cache removeCharactersFromIndex: cache_len - 1
 							 toIndex: cache_len];
 				[cache removeLeadingAndTrailingWhitespaces];

Index: tests/xmlparser.m
==================================================================
--- tests/xmlparser.m
+++ tests/xmlparser.m
@@ -104,11 +104,11 @@
 		/* FIXME: Namespace */
 		TEST(msg, et == TAG_END && [name isEqual: @"bar"] &&
 		    [prefix isEqual: @"foo"] && ns == nil)
 		break;
 	case 11:
-		TEST(msg, et == COMMENT && [comment isEqual: @"foo bar-baz"])
+		TEST(msg, et == COMMENT && [comment isEqual: @"foo bär-baz"])
 		break;
 	default:
 		TEST(msg, NO)
 		break;
 	}
@@ -162,11 +162,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFXMLParser *parser;
 	const char *str = "bar<foo:bar  bar='b&amp;az'  qux:qux=\" quux \">\r\n"
 	    "foo&lt;bar<qux  >bar <baz name='' test='&foo;'/>  quxbar\r\n</qux>"
-	    "</foo:bar><!-- foo bar-baz -->";
+	    "</foo:bar><!-- foo bär-baz -->";
 	size_t j, len;
 
 	TEST(@"+[xmlParser]", (parser = [OFXMLParser xmlParser]))
 
 	TEST(@"-[setDelegate:]",