Skip to content

G
Geth-Modification
Commit b19b7c39 authored by Péter Szilágyi's avatar Péter Szilágyi Committed by GitHub
Browse files
Options

Merge pull request #3142 from fjl/trie-sync-fix 

trie: fix regression that linked all downloaded nodes together
parents 9276c4e1 2cd7a039
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
trie/sync.go
View file @ b19b7c39
...@@ -213,11 +213,13 @@ func (s *TrieSync) children(req *request) ([]*request, error) { ...@@ -213,11 +213,13 @@ func (s *TrieSync) children(req *request) ([]*request, error) {
switch node := (*req.object).(type) { switch node := (*req.object).(type) {
case *shortNode: case *shortNode:
node = node.copy() // Prevents linking all downloaded nodes together.
children = []child{{ children = []child{{
node: &node.Val, node: &node.Val,
depth: req.depth + len(node.Key), depth: req.depth + len(node.Key),
}} }}
case *fullNode: case *fullNode:
node = node.copy()
for i := 0; i < 17; i++ { for i := 0; i < 17; i++ {
if node.Children[i] != nil { if node.Children[i] != nil {
children = append(children, child{ children = append(children, child{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment