oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix wrap_rows at inner byte of multibyte sequence

Browse source 
Also fix UTF-8 inner byte bounds and make unittest for case this fixes.
This commit is contained in:
figec 2015-06-18 21:34:17 +03:00 • committed by est31
parent e45ecad3ab
commit 3b65a6a36c
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/util/string.h
View file

@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define TOSTRING(x) STRINGIFY(x)
// Checks whether a byte is an inner byte for an utf-8 multibyte sequence
#define IS_UTF8_MULTB_INNER(x) (((unsigned char)x >= 0x80) && ((unsigned char)x <= 0xc0))
#define IS_UTF8_MULTB_INNER(x) (((unsigned char)x >= 0x80) && ((unsigned char)x < 0xc0))
typedef std::map<std::string, std::string> StringMap;
@ -426,12 +426,20 @@ inline std::string wrap_rows(const std::string &from,
{
std::string to;
bool need_to_wrap = false;
size_t character_idx = 0;
for (size_t i = 0; i < from.size(); i++) {
if (character_idx > 0 && character_idx % row_len == 0)
to += '\n';
if (!IS_UTF8_MULTB_INNER(from[i]))
need_to_wrap = true;
if (!IS_UTF8_MULTB_INNER(from[i])) {
// Wrap string if needed before next char started
if (need_to_wrap) {
to += '\n';
need_to_wrap = false;
}
character_idx++;
}
to += from[i];
}