forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm: check for errors more correctly

Browse source
This commit is contained in:
Martin Holst Swende 2018-06-11 15:12:51 +02:00
parent 5ef43e09c4
commit f178d4d0f0
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/vm/memory.go
View file

@ -35,15 +35,14 @@ func NewMemory() *Memory {
// Set sets offset + size to value // Set sets offset + size to value
func (m *Memory) Set(offset, size uint64, value []byte) { func (m *Memory) Set(offset, size uint64, value []byte) {
// length of store may never be less than offset + size.
// The store should be resized PRIOR to setting the memory
if size > uint64(len(m.store)) {
panic("INVALID memory: store empty")
}
// It's possible the offset is greater than 0 and size equals 0. This is because // It's possible the offset is greater than 0 and size equals 0. This is because
// the calcMemSize (common.go) could potentially return 0 when size is zero (NO-OP) // the calcMemSize (common.go) could potentially return 0 when size is zero (NO-OP)
if size > 0 { if size > 0 {
// length of store may never be less than offset + size.
// The store should be resized PRIOR to setting the memory
if offset+size > uint64(len(m.store)) {
panic("invalid memory: store empty")
}
copy(m.store[offset:offset+size], value) copy(m.store[offset:offset+size], value)
} }
} }
@ -53,8 +52,8 @@ func (m *Memory) Set(offset, size uint64, value []byte) {
func (m *Memory) Set32(offset uint64, val *big.Int) { func (m *Memory) Set32(offset uint64, val *big.Int) {
// length of store may never be less than offset + size. // length of store may never be less than offset + size.
// The store should be resized PRIOR to setting the memory // The store should be resized PRIOR to setting the memory
if 32 > uint64(len(m.store)) { if offset+32 > uint64(len(m.store)) {
panic("INVALID memory: store empty") panic("invalid memory: store empty")
} }
// Zero the memory area // Zero the memory area
copy(m.store[offset:offset+32], []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}) copy(m.store[offset:offset+32], []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})