diff options
author | Martin Holst Swende <martin@swende.se> | 2018-04-11 21:03:49 +0800 |
---|---|---|
committer | Martin Holst Swende <martin@swende.se> | 2018-04-11 21:03:49 +0800 |
commit | 7205366c9f85bbfcf86ac78efcd005bb10dfc5fe (patch) | |
tree | b3f594f2ba65d26dcd4e475a69e63663ddc74a63 /core/state/statedb.go | |
parent | 5a79aca8b918a177d192299984d8f287dd6c1eb4 (diff) | |
download | dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar.gz dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar.bz2 dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar.lz dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar.xz dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.tar.zst dexon-7205366c9f85bbfcf86ac78efcd005bb10dfc5fe.zip |
core/state: fix ripemd-cornercase in Copy
Diffstat (limited to 'core/state/statedb.go')
-rw-r--r-- | core/state/statedb.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/state/statedb.go b/core/state/statedb.go index 97c6e4a01..3ae6843d8 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -471,8 +471,14 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - state.stateObjects[addr] = self.stateObjects[addr].deepCopy(state) - state.stateObjectsDirty[addr] = struct{}{} + // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // and in the Finalise-method, there is a case where an object is in the journal but not + // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for + // nil + if object, exist := self.stateObjects[addr]; exist { + state.stateObjects[addr] = object.deepCopy(state) + state.stateObjectsDirty[addr] = struct{}{} + } } // Above, we don't copy the actual journal. This means that if the copy is copied, the // loop above will be a no-op, since the copy's journal is empty. |