From 1e807f6e91bad466f9e943256d673a76b212e68e Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 8 Sep 2020 19:36:07 +0200 Subject: [PATCH] Skip nil buckets in compactdb --- cmd/chantools/compactdb.go | 5 +++++ cmd/chantools/main.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/chantools/compactdb.go b/cmd/chantools/compactdb.go index f3cef7e..6b2b0ed 100644 --- a/cmd/chantools/compactdb.go +++ b/cmd/chantools/compactdb.go @@ -143,6 +143,11 @@ type walkFunc func(keys [][]byte, k, v []byte, seq uint64) error func (c *compactDBCommand) walk(db *bbolt.DB, walkFn walkFunc) error { return db.View(func(tx *bbolt.Tx) error { return tx.ForEach(func(name []byte, b *bbolt.Bucket) error { + if b == nil { + log.Errorf("Bucket %x was nil! Probable data "+ + "corruption suspected.", name) + return nil + } return c.walkBucket( b, nil, name, nil, b.Sequence(), walkFn, ) diff --git a/cmd/chantools/main.go b/cmd/chantools/main.go index a57f7ef..2e1b3a2 100644 --- a/cmd/chantools/main.go +++ b/cmd/chantools/main.go @@ -23,7 +23,7 @@ import ( const ( defaultAPIURL = "https://blockstream.info/api" - version = "0.5.0" + version = "0.5.1" ) var (