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

Fix missing returns after signing_abort

Browse Source
This commit is contained in:
Jochen Hoenicke 2017-04-08 20:32:14 +02:00
parent e5c9b361d3
commit 9d9377438c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/signing.c
View File

@ -464,10 +464,12 @@ void signing_txack(TransactionType *tx)
if (!tx->inputs[0].has_amount) { if (!tx->inputs[0].has_amount) {
fsm_sendFailure(FailureType_Failure_Other, "Segwit input without amount"); fsm_sendFailure(FailureType_Failure_Other, "Segwit input without amount");
signing_abort(); signing_abort();
return;
} }
if (to_spend + tx->inputs[0].amount < to_spend) { if (to_spend + tx->inputs[0].amount < to_spend) {
fsm_sendFailure(FailureType_Failure_Other, "Value overflow"); fsm_sendFailure(FailureType_Failure_Other, "Value overflow");
signing_abort(); signing_abort();
return;
} }
to_spend += tx->inputs[0].amount; to_spend += tx->inputs[0].amount;
segwit_to_spend += tx->inputs[0].amount; segwit_to_spend += tx->inputs[0].amount;
@ -476,6 +478,7 @@ void signing_txack(TransactionType *tx)
} else { } else {
fsm_sendFailure(FailureType_Failure_Other, "Wrong input script type"); fsm_sendFailure(FailureType_Failure_Other, "Wrong input script type");
signing_abort(); signing_abort();
return;
} }
return; return;
case STAGE_REQUEST_2_PREV_META: case STAGE_REQUEST_2_PREV_META:
@ -515,6 +518,7 @@ void signing_txack(TransactionType *tx)
if (to_spend + tx->bin_outputs[0].amount < to_spend) { if (to_spend + tx->bin_outputs[0].amount < to_spend) {
fsm_sendFailure(FailureType_Failure_Other, "Value overflow"); fsm_sendFailure(FailureType_Failure_Other, "Value overflow");
signing_abort(); signing_abort();
return;
} }
to_spend += tx->bin_outputs[0].amount; to_spend += tx->bin_outputs[0].amount;
} }
@ -601,6 +605,7 @@ void signing_txack(TransactionType *tx)
if (spending + tx->outputs[0].amount < spending) { if (spending + tx->outputs[0].amount < spending) {
fsm_sendFailure(FailureType_Failure_Other, "Value overflow"); fsm_sendFailure(FailureType_Failure_Other, "Value overflow");
signing_abort(); signing_abort();
return;
} }
spending += tx->outputs[0].amount; spending += tx->outputs[0].amount;
co = compile_output(coin, root, tx->outputs, &bin_output, !is_change); co = compile_output(coin, root, tx->outputs, &bin_output, !is_change);