@@ -1590,11 +1590,11 @@
 
 	while (i < length) {
 		of_unichar_t c;
 		size_t cLen;
 
-		cLen = of_string_utf8_to_unicode(string + i, length - 1, &c);
+		cLen = of_string_utf8_to_unicode(string + i, length - i, &c);
 
 		if (cLen == 0 || c > 0x10FFFF) {
 			free(ret);
 			@throw [OFInvalidEncodingException newWithClass: isa];
 		}