From bb8059f6aa86d1052d7c2dd75a6985982cb278f4 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Tue, 26 Jul 2016 16:37:04 +0200
Subject: core: ensure the canonical block is written before the canonical hash
 is set

---
 eth/filters/filter.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'eth')

diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index 995b588fb..fd739bf0e 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -74,6 +74,9 @@ func (self *Filter) SetTopics(topics [][]common.Hash) {
 func (self *Filter) Find() vm.Logs {
 	latestHash := core.GetHeadBlockHash(self.db)
 	latestBlock := core.GetBlock(self.db, latestHash, core.GetBlockNumber(self.db, latestHash))
+	if latestBlock == nil {
+		return vm.Logs{}
+	}
 	var beginBlockNo uint64 = uint64(self.begin)
 	if self.begin == -1 {
 		beginBlockNo = latestBlock.NumberU64()
@@ -123,13 +126,13 @@ func (self *Filter) mipFind(start, end uint64, depth int) (logs vm.Logs) {
 }
 
 func (self *Filter) getLogs(start, end uint64) (logs vm.Logs) {
-	var block *types.Block
-
 	for i := start; i <= end; i++ {
+		var block *types.Block
 		hash := core.GetCanonicalHash(self.db, i)
 		if hash != (common.Hash{}) {
 			block = core.GetBlock(self.db, hash, i)
-		} else { // block not found
+		}
+		if block == nil { // block not found/written
 			return logs
 		}
 
-- 
cgit v1.2.3