mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21260) -Codechange: make strgen more stringent w.r.t. the allowed characters in strings

release/1.1
rubidium 2010-11-19 19:38:02 +00:00
parent 8ba6d25db6
commit ede2fb8176
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/strgen/strgen.cpp
View File

@ -709,6 +709,15 @@ static void HandleString(char *str, bool master)
for (tmp = s; *tmp != '\0';) { for (tmp = s; *tmp != '\0';) {
size_t len = Utf8Validate(tmp); size_t len = Utf8Validate(tmp);
if (len == 0) error("Invalid UTF-8 sequence in '%s'", s); if (len == 0) error("Invalid UTF-8 sequence in '%s'", s);
WChar c;
Utf8Decode(&c, tmp);
if (c <= 0x001F || // ASCII control character range
(c >= 0xE000 && c <= 0xF8FF) || // Private range
(c >= 0xFFF0 && c <= 0xFFFF)) { // Specials range
error("Unwanted UTF-8 character U+%04X in sequence '%s'", c, s);
}
tmp += len; tmp += len;
} }