les: fix panic (ethereum#20013)

rjl493456442 · holiman · commit 396f1dd87b91 · 2019-08-27T15:29:00.000+02:00
diff --git a/les/server_handler.go b/les/server_handler.go
@@ -583,15 +583,14 @@ func (h *serverHandler) handleMsg(p *peer, wg *sync.WaitGroup) error {
 					}
 					// Look up the root hash belonging to the request
 					var (
-						number *uint64
 						header *types.Header
 						trie   state.Trie
 					)
 					if request.BHash != lastBHash {
 						root, lastBHash = common.Hash{}, request.BHash
 
 						if header = h.blockchain.GetHeaderByHash(request.BHash); header == nil {
-							p.Log().Warn("Failed to retrieve header for proof", "block", *number, "hash", request.BHash)
+							p.Log().Warn("Failed to retrieve header for proof", "hash", request.BHash)
 							atomic.AddUint32(&p.invalidCount, 1)
 							continue
 						}

Original file line number	Diff line number	Diff line change
`@@ -583,15 +583,14 @@ func (h serverHandler) handleMsg(p peer, wg *sync.WaitGroup) error {`
`583`	`583`	`}`
`584`	`584`	`// Look up the root hash belonging to the request`
`585`	`585`	`var (`
`586`		`- number *uint64`
`587`	`586`	`header *types.Header`
`588`	`587`	`trie state.Trie`
`589`	`588`	`)`
`590`	`589`	`if request.BHash != lastBHash {`
`591`	`590`	`root, lastBHash = common.Hash{}, request.BHash`
`592`	`591`
`593`	`592`	`if header = h.blockchain.GetHeaderByHash(request.BHash); header == nil {`
`594`		`- p.Log().Warn("Failed to retrieve header for proof", "block", *number, "hash", request.BHash)`
	`593`	`+ p.Log().Warn("Failed to retrieve header for proof", "hash", request.BHash)`
`595`	`594`	`atomic.AddUint32(&p.invalidCount, 1)`
`596`	`595`	`continue`
`597`	`596`	`}`