From 132df860d90c163a8be55260bdd219892f9e1bef Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Fri, 7 Aug 2015 12:12:05 +0200 Subject: miner, rpc: added length check for extra data --- miner/miner.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index bf6a48802..3095d9828 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -18,6 +18,7 @@ package miner import ( + "fmt" "math/big" "sync/atomic" @@ -29,6 +30,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/pow" ) @@ -143,8 +145,13 @@ func (self *Miner) HashRate() int64 { return self.pow.GetHashrate() } -func (self *Miner) SetExtra(extra []byte) { +func (self *Miner) SetExtra(extra []byte) error { + if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() { + return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), params.MaximumExtraDataSize) + } + self.worker.extra = extra + return nil } func (self *Miner) PendingState() *state.StateDB { -- cgit