aboutsummaryrefslogtreecommitdiffstats
path: root/miner/miner.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-08-07 18:12:05 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-08-07 18:24:44 +0800
commit132df860d90c163a8be55260bdd219892f9e1bef (patch)
tree9cb6baee47979b9a0d864b72466d0d15ecd08185 /miner/miner.go
parent785b3e7a575f26f3c33e3369d8a75fb131f90584 (diff)
downloaddexon-132df860d90c163a8be55260bdd219892f9e1bef.tar
dexon-132df860d90c163a8be55260bdd219892f9e1bef.tar.gz
dexon-132df860d90c163a8be55260bdd219892f9e1bef.tar.bz2
dexon-132df860d90c163a8be55260bdd219892f9e1bef.tar.lz
dexon-132df860d90c163a8be55260bdd219892f9e1bef.tar.xz
dexon-132df860d90c163a8be55260bdd219892f9e1bef.tar.zst
dexon-132df860d90c163a8be55260bdd219892f9e1bef.zip
miner, rpc: added length check for extra data
Diffstat (limited to 'miner/miner.go')
-rw-r--r--miner/miner.go9
1 files changed, 8 insertions, 1 deletions
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 {