mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

lightningd/commit_tx: don't segv on NULL htlcmap.

Browse Source 
We don't care if we're just checking sigs, so allow NULL.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-02-24 16:22:56 +10:30
parent 5d0977df3a
commit a737335da2
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lightningd/commit_tx.c
View File

@ -232,7 +232,9 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
tx = bitcoin_tx(ctx, 1, untrimmed + 2);
/* We keep track of which outputs have which HTLCs */
*htlcmap = tal_arr(tx, const struct htlc *, tal_count(tx->output));
if (htlcmap)
*htlcmap = tal_arr(tx, const struct htlc *,
tal_count(tx->output));
/* This could be done in a single loop, but we follow the BOLT
* literally to make comments in test vectors clearer. */
@ -249,7 +251,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
if (trim(htlcs[i], feerate_per_kw, dust_limit_satoshis, side))
continue;
add_offered_htlc_out(tx, n, htlcs[i], selfkey, otherkey);
(*htlcmap)[n++] = htlcs[i];
if (htlcmap)
(*htlcmap)[n++] = htlcs[i];
}
/* BOLT #3:
@ -263,7 +266,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
if (trim(htlcs[i], feerate_per_kw, dust_limit_satoshis, side))
continue;
add_received_htlc_out(tx, n, htlcs[i],selfkey, otherkey);
(*htlcmap)[n++] = htlcs[i];
if (htlcmap)
(*htlcmap)[n++] = htlcs[i];
}
/* BOLT #3:
@ -279,7 +283,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
self_delayedkey);
tx->output[n].amount = self_pay_msat / 1000;
tx->output[n].script = scriptpubkey_p2wsh(tx, wscript);
(*htlcmap)[n] = NULL;
if (htlcmap)
(*htlcmap)[n] = NULL;
SUPERVERBOSE("# to-local amount %"PRIu64" wscript %s\n",
tx->output[n].amount,
tal_hex(tmpctx, wscript));
@ -302,7 +307,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
*/
tx->output[n].amount = other_pay_msat / 1000;
tx->output[n].script = scriptpubkey_p2wpkh(tx, otherkey);
(*htlcmap)[n] = NULL;
if (htlcmap)
(*htlcmap)[n] = NULL;
SUPERVERBOSE("# to-remote amount %"PRIu64" P2WPKH(%s)\n",
tx->output[n].amount,
type_to_string(tmpctx, struct pubkey, otherkey));
@ -311,7 +317,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
assert(n <= tal_count(tx->output));
tal_resize(&tx->output, n);
tal_resize(htlcmap, n);
if (htlcmap)
tal_resize(htlcmap, n);
/* BOLT #3:
*
@ -319,7 +326,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
* order](#transaction-input-and-output-ordering)
*/
permute_outputs(tx->output, tal_count(tx->output),
(const void **)*htlcmap);
htlcmap ? (const void **)*htlcmap : NULL);
/* BOLT #3:
*

2
lightningd/commit_tx.h
View File

@ -51,7 +51,7 @@ u64 commit_tx_base_fee(u64 feerate_per_kw, size_t num_untrimmed_htlcs);
* @self_pay_msat: amount to pay directly to self
* @other_pay_msat: amount to pay directly to the other side
* @htlcs: tal_arr of htlcs committed by transaction (some may be trimmed)
* @htlc_map: outputed map of outnum->HTLC (NULL for direct outputs).
* @htlc_map: outputed map of outnum->HTLC (NULL for direct outputs), or NULL.
* @obscured_commitment_number: number to encode in commitment transaction
* @side: side to generate commitment transaction for.
*