Skip to content

Commit f54edd0

Browse files
committed
fix(core): ensure proper handling of vendor string
[no changelog]
1 parent a44c660 commit f54edd0

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

core/embed/trezorhal/stm32f4/fwutils.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,17 @@ secbool firmware_get_vendor(char* buff, size_t buff_size) {
8383

8484
vendor_header vhdr = {0};
8585

86+
memset(buff, 0, buff_size);
87+
8688
if (data == NULL || sectrue != read_vendor_header(data, &vhdr)) {
8789
return secfalse;
8890
}
8991

90-
if (buff == NULL || buff_size < vhdr.vstr_len + 1) {
92+
if (buff_size < vhdr.vstr_len + 1) {
9193
return secfalse;
9294
}
9395

94-
strncpy(buff, vhdr.vstr, buff_size);
96+
memcpy(buff, vhdr.vstr, vhdr.vstr_len);
9597

9698
return sectrue;
9799
}

0 commit comments

Comments
 (0)