pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

particle/string: don't cut in the middle of an utf-8 multibyte

Browse source 
When limiting a string (due to it exceeding it's max length), make
sure not to cut it in the middle of an utf-8 multibyte, as this
results in an invalid utf-8 string.
This commit is contained in:
Daniel Eklöf 2019-01-17 20:44:51 +01:00
parent 09270c4670
commit 04f7f3485f
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
particles/string.c
View file

@ -108,13 +108,25 @@ instantiate(const struct particle *particle, const struct tag_set *tags)
memset(&e->extents, 0, sizeof(e->extents));
if (p->max_len > 0) {
size_t len = strlen(e->text);
const size_t len = strlen(e->text);
if (len > p->max_len) {
if (p->max_len >= 3) {
for (size_t i = 0; i < 3; i++)
e->text[p->max_len - 3 + i] = '.';
size_t end = p->max_len;
if (end >= 3) {
/* "allocate" room for three dots at the end */
end -= 3;
}
e->text[p->max_len] = '\0';
/* Mucho importante - don't cut in the middle of a utf8 multibyte */
while (end > 0 && e->text[end - 1] >> 7)
end--;
if (p->max_len > 3) {
for (size_t i = 0; i < 3; i++)
e->text[end + i] = '.';
e->text[end + 3] = '\0';
} else
e->text[end] = '\0';
}
}