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

trie: fix regression that linked all downloaded nodes together
vivekanand1101 · Oct 15, 2016 · b19b7c3 · b19b7c3
2 parents 9276c4e + 2cd7a03
commit b19b7c3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/trie/sync.go b/trie/sync.go
@@ -213,11 +213,13 @@ func (s *TrieSync) children(req *request) ([]*request, error) {
 
 	switch node := (*req.object).(type) {
 	case *shortNode:
+		node = node.copy() // Prevents linking all downloaded nodes together.
 		children = []child{{
 			node:  &node.Val,
 			depth: req.depth + len(node.Key),
 		}}
 	case *fullNode:
+		node = node.copy()
 		for i := 0; i < 17; i++ {
 			if node.Children[i] != nil {
 				children = append(children, child{