aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

commit_tx: plug leak.

Browse Source 
Use a tmpctx, and clean up afterwards.  Steal the script onto the tx,
however.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-11-04 11:16:14 +10:30
parent 1d57fa60b8
commit b768de324c
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
daemon/commit_tx.c
View File

@@ -114,13 +114,14 @@ u8 *commit_output_to_them(const tal_t *ctx,
} }
} }
/* Takes ownership of script. */
static bool add_output(struct bitcoin_tx *tx, u8 *script, u64 amount, static bool add_output(struct bitcoin_tx *tx, u8 *script, u64 amount,
u64 *total) u64 *total)
{ {
assert(tx->output_count < tal_count(tx->output)); assert(tx->output_count < tal_count(tx->output));
if (is_dust(amount)) if (is_dust(amount))
return false; return false;
tx->output[tx->output_count].script = script; tx->output[tx->output_count].script = tal_steal(tx, script);
tx->output[tx->output_count].script_length = tal_count(script); tx->output[tx->output_count].script_length = tal_count(script);
tx->output[tx->output_count].amount = amount; tx->output[tx->output_count].amount = amount;
tx->output_count++; tx->output_count++;
@@ -135,6 +136,7 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
enum side side, enum side side,
bool *otherside_only) bool *otherside_only)
{ {
const tal_t *tmpctx = tal_tmpctx(ctx);
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
uint64_t total = 0; uint64_t total = 0;
struct htlc_map_iter it; struct htlc_map_iter it;
@@ -162,26 +164,29 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
tx->input[0].amount = tal_dup(tx->input, u64, &peer->anchor.satoshis); tx->input[0].amount = tal_dup(tx->input, u64, &peer->anchor.satoshis);
tx->output_count = 0; tx->output_count = 0;
pays_to[LOCAL] = add_output(tx, commit_output_to_us(tx, peer, rhash, pays_to[LOCAL] = add_output(tx, commit_output_to_us(tmpctx, peer, rhash,
side, NULL), side, NULL),
cstate->side[LOCAL].pay_msat / 1000, cstate->side[LOCAL].pay_msat / 1000,
&total); &total);
if (pays_to[LOCAL]) if (pays_to[LOCAL])
log_debug(peer->log, "Pays %u to local: %s", log_debug(peer->log, "Pays %u to local: %s",
cstate->side[LOCAL].pay_msat / 1000, cstate->side[LOCAL].pay_msat / 1000,
tal_hexstr(tx, tx->output[tx->output_count-1].script, tal_hexstr(tmpctx,
tx->output[tx->output_count-1].script,
tx->output[tx->output_count-1].script_length)); tx->output[tx->output_count-1].script_length));
else else
log_debug(peer->log, "DOES NOT pay %u to local", log_debug(peer->log, "DOES NOT pay %u to local",
cstate->side[LOCAL].pay_msat / 1000); cstate->side[LOCAL].pay_msat / 1000);
pays_to[REMOTE] = add_output(tx, commit_output_to_them(tx, peer, rhash, pays_to[REMOTE] = add_output(tx, commit_output_to_them(tmpctx, peer,
side, NULL), rhash, side,
NULL),
cstate->side[REMOTE].pay_msat / 1000, cstate->side[REMOTE].pay_msat / 1000,
&total); &total);
if (pays_to[REMOTE]) if (pays_to[REMOTE])
log_debug(peer->log, "Pays %u to remote: %s", log_debug(peer->log, "Pays %u to remote: %s",
cstate->side[REMOTE].pay_msat / 1000, cstate->side[REMOTE].pay_msat / 1000,
tal_hexstr(tx, tx->output[tx->output_count-1].script, tal_hexstr(tmpctx,
tx->output[tx->output_count-1].script,
tx->output[tx->output_count-1].script_length)); tx->output[tx->output_count-1].script_length));
else else
log_debug(peer->log, "DOES NOT pay %u to remote", log_debug(peer->log, "DOES NOT pay %u to remote",
@@ -200,7 +205,7 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
continue; continue;
wscript = wscript_for_htlc(tx, peer, h, rhash, side); wscript = wscript_for_htlc(tx, peer, h, rhash, side);
/* If we pay any HTLC, it's txout is not just to other side. */ /* If we pay any HTLC, it's txout is not just to other side. */
if (add_output(tx, scriptpubkey_p2wsh(tx, wscript), if (add_output(tx, scriptpubkey_p2wsh(tmpctx, wscript),
h->msatoshi / 1000, &total)) { h->msatoshi / 1000, &total)) {
*otherside_only = false; *otherside_only = false;
log_debug(peer->log, "Pays %"PRIu64" to htlc %"PRIu64, log_debug(peer->log, "Pays %"PRIu64" to htlc %"PRIu64,
@@ -210,7 +215,8 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
log_add_struct(peer->log, " rhash %s", struct sha256, log_add_struct(peer->log, " rhash %s", struct sha256,
&h->rhash); &h->rhash);
log_debug(peer->log, "Script: %s", log_debug(peer->log, "Script: %s",
tal_hexstr(tx, wscript, tal_count(wscript))); tal_hexstr(tmpctx,
wscript, tal_count(wscript)));
} else } else
log_debug(peer->log, "DOES NOT pay %"PRIu64" to htlc %"PRIu64, log_debug(peer->log, "DOES NOT pay %"PRIu64" to htlc %"PRIu64,
h->msatoshi / 1000, h->id); h->msatoshi / 1000, h->id);
@@ -218,5 +224,6 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
assert(total <= peer->anchor.satoshis); assert(total <= peer->anchor.satoshis);
permute_outputs(tx->output, tx->output_count); permute_outputs(tx->output, tx->output_count);
tal_free(tmpctx);
return tx; return tx;
} }