cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

yulInterpreter: Fix u256 overflow in logMemory.

Browse Source
This commit is contained in:
Bhargava Shastry 2019-02-28 16:42:13 +01:00
parent ab33ff1408
commit c48cc19fae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
View File

@ -460,10 +460,10 @@ bool EVMInstructionInterpreter::logMemory(bool _write, u256 const& _offset, u256
size_t constexpr maxMemSize = 0x20000000; size_t constexpr maxMemSize = 0x20000000;
logTrace(_write ? "MSTORE_AT_SIZE" : "MLOAD_FROM_SIZE", {_offset, _size}, _data); logTrace(_write ? "MSTORE_AT_SIZE" : "MLOAD_FROM_SIZE", {_offset, _size}, _data);
if (_offset + _size >= _offset)
if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
{ {
u256 newSize = _offset + _size; u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
newSize = (newSize + 0x1f) & ~u256(0x1f);
m_state.msize = max(m_state.msize, newSize); m_state.msize = max(m_state.msize, newSize);
if (newSize < maxMemSize) if (newSize < maxMemSize)
{ {