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

trie: fix regression that linked all downloaded nodes together
8 years ago · b19b7c39ac
parent 9276c4e163 2cd7a0395d
commit b19b7c39ac
1 changed files with 2 additions and 0 deletions
--- 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{