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

lightingd: fix memleak when we reload from db.

Browse Source 
We always arm the funding_lockin_cb, even if we don't need to.  If we
have an short_channel_id already from the db, this was replacing it
and leaking the old one.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-01-05 13:12:31 +10:30
committed by Christian Decker
parent fb81e6c14b
commit ee939c8dcb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lightningd/peer_control.c
View File

@@ -1502,10 +1502,13 @@ static enum watch_result funding_lockin_cb(struct peer *peer,
loc = locate_tx(peer, peer->ld->topology, &txid);
peer->scid = tal(peer, struct short_channel_id);
peer->scid->blocknum = loc->blkheight;
peer->scid->txnum = loc->index;
peer->scid->outnum = peer->funding_outnum;
/* If we restart, we could already have peer->scid from database */
if (!peer->scid) {
peer->scid = tal(peer, struct short_channel_id);
peer->scid->blocknum = loc->blkheight;
peer->scid->txnum = loc->index;
peer->scid->outnum = peer->funding_outnum;
}
tal_free(loc);
/* In theory, it could have been buried before we got back