From 3c7181d28f1f24aaea2da5cce664ffac52f369df Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 2 Feb 2015 19:58:34 -0800
Subject: Fixed a copy issue in the trie which could cause a consensus failure

---
 trie/shortnode.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'trie/shortnode.go')

diff --git a/trie/shortnode.go b/trie/shortnode.go
index f132b56d9..d96492958 100644
--- a/trie/shortnode.go
+++ b/trie/shortnode.go
@@ -1,5 +1,7 @@
 package trie
 
+import "github.com/ethereum/go-ethereum/ethutil"
+
 type ShortNode struct {
 	trie  *Trie
 	key   []byte
@@ -15,7 +17,11 @@ func (self *ShortNode) Value() Node {
 	return self.value
 }
 func (self *ShortNode) Dirty() bool { return true }
-func (self *ShortNode) Copy() Node  { return NewShortNode(self.trie, self.key, self.value) }
+func (self *ShortNode) Copy(t *Trie) Node {
+	node := &ShortNode{t, nil, self.value.Copy(t)}
+	node.key = ethutil.CopyBytes(self.key)
+	return node
+}
 
 func (self *ShortNode) RlpData() interface{} {
 	return []interface{}{self.key, self.value.Hash()}
-- 
cgit v1.2.3