Merge pull request #22332 from karalabe/fix-fastsync-restart-bloom-crash

trie: fix bloom crash on fast sync restart
4 years ago · 915c614959
parent f4fcd4f506 e991bdae24
commit 915c614959
1 changed files with 6 additions and 2 deletions
--- a/trie/sync.go
+++ b/trie/sync.go
@ -313,11 +313,15 @@ func (s *Sync) Commit(dbw ethdb.Batch) error {
 	// Dump the membatch into a database dbw
 	for key, value := range s.membatch.nodes {
 		rawdb.WriteTrieNode(dbw, key, value)
-		s.bloom.Add(key[:])
+		if s.bloom != nil {
+			s.bloom.Add(key[:])
+		}
 	}
 	for key, value := range s.membatch.codes {
 		rawdb.WriteCode(dbw, key, value)
-		s.bloom.Add(key[:])
+		if s.bloom != nil {
+			s.bloom.Add(key[:])
+		}
 	}
 	// Drop the membatch data and return
 	s.membatch = newSyncMemBatch()