circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return new character properly when converting to data.

This commit is contained in:
nicm 2020-05-26 12:50:03 +00:00
parent 392b381d1c
commit ff6f2ff6d9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utf8.c
View File

@ -136,12 +136,16 @@ utf8_from_data(const struct utf8_data *ud, utf8_char *uc)
u_int offset; u_int offset;
if (ud->width != 1 && ud->width != 2) if (ud->width != 1 && ud->width != 2)
return (utf8_space1.uc); fatalx("invalid UTF-8 width");
if (ud->size == 0)
fatalx("invalid UTF-8 size");
if (ud->size > UTF8_FLAG_SIZE) if (ud->size > UTF8_FLAG_SIZE)
goto fail; goto fail;
if (ud->size == 1) if (ud->size == 1) {
return (utf8_build_one(ud->data[0], 1)); *uc = utf8_build_one(ud->data[0], 1);
return (UTF8_DONE);
}
m.flags = ud->size; m.flags = ud->size;
if (ud->width == 2) if (ud->width == 2)