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

Merge pull request #6385 from ethereum/ossfuzz-interpreter-config-update

Browse Source 
yul Interpreter: Move memory size limit to interpreter state.
This commit is contained in:
chriseth 2019-03-26 15:30:50 +01:00 committed by GitHub
commit fad6ec2e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tools/ossfuzz/yulFuzzerCommon.cpp
View File

@ -23,7 +23,7 @@ using namespace yul::test::yul_fuzzer;
void yulFuzzerUtil::interpret(ostream& _os, shared_ptr<yul::Block> _ast) void yulFuzzerUtil::interpret(ostream& _os, shared_ptr<yul::Block> _ast)
{ {
InterpreterState state; InterpreterState state;
state.maxTraceSize = 10000; state.maxTraceSize = 75;
Interpreter interpreter(state); Interpreter interpreter(state);
try try
{ {

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

@ -455,17 +455,13 @@ bool EVMInstructionInterpreter::logMemoryWrite(u256 const& _offset, u256 const&
bool EVMInstructionInterpreter::logMemory(bool _write, u256 const& _offset, u256 const& _size, bytes const& _data) bool EVMInstructionInterpreter::logMemory(bool _write, u256 const& _offset, u256 const& _size, bytes const& _data)
{ {
/// Memory size limit. Anything beyond this will still work, but it has
/// deterministic yet not necessarily consistent behaviour.
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) && ((_offset + _size + 0x1f) >= (_offset + _size))) if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
{ {
u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f); u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
m_state.msize = max(m_state.msize, newSize); m_state.msize = max(m_state.msize, newSize);
if (newSize < maxMemSize) if (newSize < m_state.maxMemSize)
{ {
if (m_state.memory.size() < newSize) if (m_state.memory.size() < newSize)
m_state.memory.resize(size_t(newSize)); m_state.memory.resize(size_t(newSize));

3
test/tools/yulInterpreter/Interpreter.h
View File

@ -72,6 +72,9 @@ struct InterpreterState
std::vector<std::string> trace; std::vector<std::string> trace;
/// This is actually an input parameter that more or less limits the runtime. /// This is actually an input parameter that more or less limits the runtime.
size_t maxTraceSize = 0; size_t maxTraceSize = 0;
/// Memory size limit. Anything beyond this will still work, but it has
/// deterministic yet not necessarily consistent behaviour.
size_t maxMemSize = 0x200;
LoopState loopState = LoopState::Default; LoopState loopState = LoopState::Default;
}; };

1
test/tools/yulrun.cpp
View File

@ -86,6 +86,7 @@ void interpret(string const& _source)
InterpreterState state; InterpreterState state;
state.maxTraceSize = 10000; state.maxTraceSize = 10000;
state.maxMemSize = 0x20000000;
Interpreter interpreter(state); Interpreter interpreter(state);
try try
{ {