Mercurial > hg > openttd

changeset 6274:a51753c89fad draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r9083) -Codechange: Be more lenient when trimming UTF-8 strings and don't terminate the string when an invalid encoding is encountered, but only focus on maximum length.
author Darkvater <Darkvater@openttd.org>
date Sat, 10 Mar 2007 00:26:19 +0000
parents 442b0e075488
children 95966cefdddc
files src/string.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -282,7 +282,8 @@
 
 	for (const char *ptr = strchr(s, '\0'); *s != '\0';) {
 		size_t len = Utf8EncodedCharLen(*s);
-		if (len == 0) break; // invalid encoding
+		/* Silently ignore invalid UTF8 sequences, our only concern trimming */
+		if (len == 0) len = 1;
 
 		/* Take care when a hard cutoff was made for the string and
 		 * the last UTF8 sequence is invalid */