From 3b3c7554b75fcd31ebefc338ad197594b58e45cf Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 10 Mar 2007 00:26:19 +0000 Subject: [PATCH] (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. --- src/string.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/string.cpp b/src/string.cpp index b5957622e7..aea4bad9da 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -282,7 +282,8 @@ size_t Utf8TrimString(char *s, size_t maxlen) 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 */