diff options
| author | Felix Lange <fjl@twurst.com> | 2015-07-23 02:10:41 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-07-23 02:10:41 +0800 |
| commit | 26a269ea09667f7e49b89f96bb5eaee66c0d10f8 (patch) | |
| tree | e499c62367e79e58a15022cc81145a1c50c54e1d /core | |
| parent | d1d45aa8390731ad9d0422e6bbf2d451d11dab4d (diff) | |
| parent | 04bb89604e6fcd40a79499ea0f53d161e5ca7890 (diff) | |
| download | go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar.gz go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar.bz2 go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar.lz go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar.xz go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.tar.zst go-tangerine-26a269ea09667f7e49b89f96bb5eaee66c0d10f8.zip | |
Merge pull request #1511 from karalabe/rlp-data-race
core: fix an RLP encoding data race due to deep struct copy
Diffstat (limited to 'core')
| -rw-r--r-- | core/types/block.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/types/block.go b/core/types/block.go index 562fa64b9..f9ac19c7e 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -257,7 +257,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error { return nil } -func (b Block) EncodeRLP(w io.Writer) error { +func (b *Block) EncodeRLP(w io.Writer) error { return rlp.Encode(w, extblock{ Header: b.header, Txs: b.transactions, @@ -274,7 +274,7 @@ func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error { return nil } -func (b StorageBlock) EncodeRLP(w io.Writer) error { +func (b *StorageBlock) EncodeRLP(w io.Writer) error { return rlp.Encode(w, storageblock{ Header: b.header, Txs: b.transactions, |