0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix missing catch invalid_utf8_exception

Browse source 
this caused crashes when loading certain replays.
This commit is contained in:
gfgtdf 2018-12-30 23:06:38 +01:00 • committed by GitHub
parent 21c20b951d
commit 7875f4fc08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/font/sdl_ttf.cpp
View file

@ -450,17 +450,22 @@ std::string make_text_ellipsis(const std::string &text, int font_size,
std::string current_substring;
utf8::iterator itor(text);
try {
utf8::iterator itor(text);
for(; itor != utf8::iterator::end(text); ++itor) {
std::string tmp = current_substring;
tmp.append(itor.substr().first, itor.substr().second);
for(; itor != utf8::iterator::end(text); ++itor) {
std::string tmp = current_substring;
tmp.append(itor.substr().first, itor.substr().second);
if (line_width(tmp + ellipsis, font_size, style) > max_width) {
return current_substring + ellipsis;
}
if (line_width(tmp + ellipsis, font_size, style) > max_width) {
return current_substring + ellipsis;
current_substring.append(itor.substr().first, itor.substr().second);
}
current_substring.append(itor.substr().first, itor.substr().second);
}
catch(utf8::invalid_utf8_exception&) {
WRN_FT << "Invalid UTF-8 string: \"" << text << "\"" << std::endl;
return "";
}
return text; // Should not happen