Skip to content

G
Geth-Modification
Commit 26a269ea authored by Felix Lange's avatar Felix Lange
Browse files
Options

Merge pull request #1511 from karalabe/rlp-data-race 

core: fix an RLP encoding data race due to deep struct copy
parents d1d45aa8 04bb8960
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
core/types/block.go
View file @ 26a269ea
...@@ -257,7 +257,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error { ...@@ -257,7 +257,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error {
return nil return nil
} }
func (b Block) EncodeRLP(w io.Writer) error { func (b *Block) EncodeRLP(w io.Writer) error {
return rlp.Encode(w, extblock{ return rlp.Encode(w, extblock{
Header: b.header, Header: b.header,
Txs: b.transactions, Txs: b.transactions,
...@@ -274,7 +274,7 @@ func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error { ...@@ -274,7 +274,7 @@ func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error {
return nil return nil
} }
func (b StorageBlock) EncodeRLP(w io.Writer) error { func (b *StorageBlock) EncodeRLP(w io.Writer) error {
return rlp.Encode(w, storageblock{ return rlp.Encode(w, storageblock{
Header: b.header, Header: b.header,
Txs: b.transactions, Txs: b.transactions,
......
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