arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-17 01:52:02 +00:00
Code Issues Releases Wiki Activity

fsm: fix race condition in GetAddress

Browse Source
This commit is contained in:
Pavol Rusnak 2017-08-23 16:36:38 +02:00
parent e5d3a2169b
commit 07f6e495b7
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/fsm.c
View File

@ -642,8 +642,9 @@ void fsm_msgGetAddress(GetAddress *msg)
if (!node) return;
hdnode_fill_public_key(node);
char address[MAX_ADDR_SIZE];
layoutProgress(_("Computing address"), 0);
if (!compute_address(coin, msg->script_type, node, msg->has_multisig, &msg->multisig, resp->address)) {
if (!compute_address(coin, msg->script_type, node, msg->has_multisig, &msg->multisig, address)) {
fsm_sendFailure(FailureType_Failure_DataError, _("Can't encode address"));
layoutHome();
return;
@ -664,7 +665,7 @@ void fsm_msgGetAddress(GetAddress *msg)
}
bool qrcode = false;
for (;;) {
layoutAddress(resp->address, desc, qrcode);
layoutAddress(address, desc, qrcode);
if (protectButton(ButtonRequestType_ButtonRequest_Address, false)) {
break;
}
@ -672,6 +673,7 @@ void fsm_msgGetAddress(GetAddress *msg)
}
}
strlcpy(resp->address, address, sizeof(resp->address));
msg_write(MessageType_MessageType_Address, resp);
layoutHome();
}