aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 16:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitcoin/tx: fix bug in fromwire_bitcoin_tx.

Browse Source 
If we fail to unmarshal the tx (shouldn't happen, but...) we must
not dereference NULL.

Also tighten the check: towire_ must send 0 or all inputs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-05-19 10:58:13 +09:30
committed by Christian Decker
parent b920d4d21b
commit f1426bad8e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bitcoin/tx.c
View File

@@ -602,10 +602,17 @@ struct bitcoin_tx *fromwire_bitcoin_tx(const tal_t *ctx,
size_t i;
tx = pull_bitcoin_tx(ctx, cursor, max);
if (!tx)
return fromwire_fail(cursor, max);
input_amts_len = fromwire_u16(cursor, max);
/* We don't serialize the amounts if they're not *all* populated */
if (input_amts_len != tal_count(tx->input_amounts))
return tx;
/* They must give us none or all */
if (input_amts_len != 0
&& input_amts_len != tal_count(tx->input_amounts)) {
tal_free(tx);
return fromwire_fail(cursor, max);
}
for (i = 0; i < input_amts_len; i++) {
struct amount_sat sat;