akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3313 from wpaulino/neutrino-cleanup-panic

Browse Source 
lnd: prevent panic on nil neutrino cleanup
This commit is contained in:
Olaoluwa Osuntokun 2019-07-15 19:41:29 -07:00 committed by GitHub
commit a7152efca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chainregistry.go
View File

@ -713,6 +713,7 @@ func initNeutrinoBackend(chainDir string) (*neutrino.ChainService, func(), error
cfg.NeutrinoMode.AssertFilterHeader, cfg.NeutrinoMode.AssertFilterHeader,
) )
if err != nil { if err != nil {
db.Close()
return nil, nil, err return nil, nil, err
} }
@ -754,6 +755,7 @@ func initNeutrinoBackend(chainDir string) (*neutrino.ChainService, func(), error
neutrinoCS, err := neutrino.NewChainService(config) neutrinoCS, err := neutrino.NewChainService(config)
if err != nil { if err != nil {
db.Close()
return nil, nil, fmt.Errorf("unable to create neutrino light "+ return nil, nil, fmt.Errorf("unable to create neutrino light "+
"client: %v", err) "client: %v", err)
} }

2
lnd.go
View File

@ -203,10 +203,10 @@ func Main() error {
neutrinoBackend, neutrinoCleanUp, err := initNeutrinoBackend( neutrinoBackend, neutrinoCleanUp, err := initNeutrinoBackend(
mainChain.ChainDir, mainChain.ChainDir,
) )
defer neutrinoCleanUp()
if err != nil { if err != nil {
return err return err
} }
defer neutrinoCleanUp()
neutrinoCS = neutrinoBackend neutrinoCS = neutrinoBackend
} }