arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-27 18:32:34 +00:00
Code Issues Releases Wiki Activity

fix(legacy): Fix split_message() to correctly handle strings that are not null-terminated.

Browse Source
This commit is contained in:
Andrew Kozlik 2021-11-10 08:28:38 +01:00 committed by Andrew Kozlik
parent d8de95767d
commit 0737deedc4
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/firmware/layout2.c
View File

@ -189,18 +189,17 @@ const char **split_message(const uint8_t *msg, uint32_t len, uint32_t rowlen) {
if (rowlen > 32) { if (rowlen > 32) {
rowlen = 32; rowlen = 32;
} }
memzero(str, sizeof(str)); memzero(str, sizeof(str));
strlcpy(str[0], (char *)msg, rowlen + 1); for (int i = 0; i < 4; ++i) {
if (len > rowlen) { size_t show_len = strnlen((char *)msg, MIN(rowlen, len));
strlcpy(str[1], (char *)msg + rowlen, rowlen + 1); memcpy(str[i], (char *)msg, show_len);
str[i][show_len] = '\0';
msg += show_len;
len -= show_len;
} }
if (len > rowlen * 2) {
strlcpy(str[2], (char *)msg + rowlen * 2, rowlen + 1); if (len > 0) {
}
if (len > rowlen * 3) {
strlcpy(str[3], (char *)msg + rowlen * 3, rowlen + 1);
}
if (len > rowlen * 4) {
str[3][rowlen - 1] = '.'; str[3][rowlen - 1] = '.';
str[3][rowlen - 2] = '.'; str[3][rowlen - 2] = '.';
str[3][rowlen - 3] = '.'; str[3][rowlen - 3] = '.';