cerc-io/solidity
15
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

Add upper bound assert for PushSub/PushSubSize

Browse Source
This commit is contained in:
Alex Beregszaszi 2019-01-29 15:15:58 +00:00
parent dce52509b4
commit 59df7dbc1b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libevmasm/Assembly.cpp
View File

@ -596,12 +596,14 @@ LinkerObject const& Assembly::assemble() const
ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef); ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
break; break;
case PushSub: case PushSub:
assertThrow(i.data() <= size_t(-1), AssemblyException, "");
ret.bytecode.push_back(dataRefPush); ret.bytecode.push_back(dataRefPush);
subRef.insert(make_pair(size_t(i.data()), ret.bytecode.size())); subRef.insert(make_pair(size_t(i.data()), ret.bytecode.size()));
ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef); ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
break; break;
case PushSubSize: case PushSubSize:
{ {
assertThrow(i.data() <= size_t(-1), AssemblyException, "");
auto s = m_subs.at(size_t(i.data()))->assemble().bytecode.size(); auto s = m_subs.at(size_t(i.data()))->assemble().bytecode.size();
i.setPushedValue(u256(s)); i.setPushedValue(u256(s));
uint8_t b = max<unsigned>(1, dev::bytesRequired(s)); uint8_t b = max<unsigned>(1, dev::bytesRequired(s));