mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-13 11:09:23 +01:00
Code Issues Projects Releases Wiki Activity

peer: fix panic bug in watiForChanToClose

Browse source 
This commit fixes a panic bug in the watiForChanToClose method caused
by a logic error leading to the return value of the function at times
being a nil pointer in the case that an error occurred. We now avoid
such an error by _always_ returning from the function if there’s an
error, but conditionally (in a diff if-clause) sending an error over
the error channel.
This commit is contained in:
Olaoluwa Osuntokun 2017-05-15 17:53:22 -07:00
parent 40a7523b8f
commit 620695542c
No known key found for this signature in database
GPG key ID: 9CC5B105D03521A2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
peer.go
View file

@ -1069,8 +1069,10 @@ func waitForChanToClose(bestHeight uint32, notifier chainntnfs.ChainNotifier,
// TODO(roasbeef): add param for num needed confs // TODO(roasbeef): add param for num needed confs
confNtfn, err := notifier.RegisterConfirmationsNtfn(closingTxID, 1, confNtfn, err := notifier.RegisterConfirmationsNtfn(closingTxID, 1,
bestHeight) bestHeight)
if err != nil && errChan != nil { if err != nil {
errChan <- err if errChan != nil {
errChan <- err
}
return return
} }