Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 00:43:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug causing messages containing newline byte to disappear

Browse Source 
The wcswidth() function was silently failing when trying to convert
messages containing a newline to a widechar buffer which resulted
in the message showing up as an empty line. we now fall back
to using strlen to get the width of the string, which might still
cause minor display bugs when the message contains unicode, but is
still better than losing messages entirely.
This commit is contained in:
jfreegman 2022-03-02 15:58:21 -05:00
parent 0c11b3121a
commit 310cf464d0
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/line_info.c
View File

@ -345,22 +345,25 @@ static uint16_t line_info_add_msg(wchar_t *buf, size_t buf_size, const char *msg
return 0; return 0;
} }
uint16_t width = 0;
const wint_t wc_msg_len = mbs_to_wcs_buf(buf, msg, buf_size); const wint_t wc_msg_len = mbs_to_wcs_buf(buf, msg, buf_size);
if (wc_msg_len > 0 && wc_msg_len < buf_size) { if (wc_msg_len > 0 && wc_msg_len < buf_size) {
buf[wc_msg_len] = L'\0'; buf[wc_msg_len] = L'\0';
width = (uint16_t) wcswidth(buf, wc_msg_len); int width = wcswidth(buf, wc_msg_len);
if (width == -1) { // the best we can do on failure is to fall back to strlen
width = strlen(msg);
}
return (uint16_t)width;
} else { } else {
fprintf(stderr, "Failed to convert string '%s' to widechar\n", msg); fprintf(stderr, "Failed to convert string '%s' to widechar\n", msg);
const wchar_t *err = L"Failed to parse message"; const wchar_t *err = L"Failed to parse message";
width = wcslen(err); uint16_t width = (uint16_t)wcslen(err);
wmemcpy(buf, err, width); wmemcpy(buf, err, width);
buf[width] = L'\0'; buf[width] = L'\0';
return width;
} }
return width;
} }
static void line_info_init_line(ToxWindow *self, struct line_info *line) static void line_info_init_line(ToxWindow *self, struct line_info *line)

3
src/misc_tools.c
View File

@ -477,10 +477,9 @@ on_error:
returns length of msg, which will be no larger than size-1 */ returns length of msg, which will be no larger than size-1 */
size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length) size_t copy_tox_str(char *msg, size_t size, const char *data, size_t length)
{ {
size_t i;
size_t j = 0; size_t j = 0;
for (i = 0; (i < length) && (j < size - 1); ++i) { for (size_t i = 0; (i < length) && (j < size - 1); ++i) {
if (data[i] != '\r') { if (data[i] != '\r') {
msg[j++] = data[i]; msg[j++] = data[i];
} }