mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

peer_control: fix opening fundee leaks.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-12-15 20:59:14 +10:30 committed by Christian Decker
parent 4957921e02
commit adf8740b96
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lightningd/peer_control.c
View File

@ -2264,6 +2264,7 @@ static void opening_fundee_finished(struct subd *opening,
u64 gossip_index; u64 gossip_index;
secp256k1_ecdsa_signature remote_commit_sig; secp256k1_ecdsa_signature remote_commit_sig;
struct bitcoin_tx *remote_commit; struct bitcoin_tx *remote_commit;
const tal_t *tmpctx = tal_tmpctx(peer);
log_debug(peer->log, "Got opening_fundee_finish_response"); log_debug(peer->log, "Got opening_fundee_finish_response");
assert(tal_count(fds) == 2); assert(tal_count(fds) == 2);
@ -2276,7 +2277,7 @@ static void opening_fundee_finished(struct subd *opening,
peer->channel_info->their_config.id = 0; peer->channel_info->their_config.id = 0;
peer->funding_txid = tal(peer, struct sha256_double); peer->funding_txid = tal(peer, struct sha256_double);
if (!fromwire_opening_fundee_reply(peer, reply, NULL, if (!fromwire_opening_fundee_reply(tmpctx, reply, NULL,
&channel_info->their_config, &channel_info->their_config,
remote_commit, remote_commit,
&remote_commit_sig, &remote_commit_sig,
@ -2297,6 +2298,7 @@ static void opening_fundee_finished(struct subd *opening,
&funding_signed)) { &funding_signed)) {
peer_internal_error(peer, "bad OPENING_FUNDEE_REPLY %s", peer_internal_error(peer, "bad OPENING_FUNDEE_REPLY %s",
tal_hex(reply, reply)); tal_hex(reply, reply));
tal_free(tmpctx);
return; return;
} }
@ -2310,8 +2312,10 @@ static void opening_fundee_finished(struct subd *opening,
/* Now, keep the initial commit as our last-tx-to-broadcast. */ /* Now, keep the initial commit as our last-tx-to-broadcast. */
peer_last_tx(peer, remote_commit, &remote_commit_sig); peer_last_tx(peer, remote_commit, &remote_commit_sig);
if (!peer_commit_initial(peer)) if (!peer_commit_initial(peer)) {
tal_free(tmpctx);
return; return;
}
log_debug(peer->log, "Watching funding tx %s", log_debug(peer->log, "Watching funding tx %s",
type_to_string(reply, struct sha256_double, type_to_string(reply, struct sha256_double,
@ -2330,6 +2334,7 @@ static void opening_fundee_finished(struct subd *opening,
peer_start_channeld(peer, &cs, gossip_index, peer_start_channeld(peer, &cs, gossip_index,
fds[0], fds[1], funding_signed, false); fds[0], fds[1], funding_signed, false);
peer_set_condition(peer, OPENINGD, CHANNELD_AWAITING_LOCKIN); peer_set_condition(peer, OPENINGD, CHANNELD_AWAITING_LOCKIN);
tal_free(tmpctx);
} }
/* Negotiation failed, but we can keep gossipping */ /* Negotiation failed, but we can keep gossipping */