Handle return memory of size 0 and large offset

This commit is contained in:
Paweł Bylica 2015-01-09 17:23:10 +01:00
parent 98a30815ac
commit 858273bc89

View file

@ -24,8 +24,10 @@ bytes Runtime::getReturnData() const // FIXME: Reconsider returning by copy
auto offset = static_cast<size_t>(llvm2eth(m_data.elems[RuntimeData::ReturnDataOffset])); auto offset = static_cast<size_t>(llvm2eth(m_data.elems[RuntimeData::ReturnDataOffset]));
auto size = static_cast<size_t>(llvm2eth(m_data.elems[RuntimeData::ReturnDataSize])); auto size = static_cast<size_t>(llvm2eth(m_data.elems[RuntimeData::ReturnDataSize]));
assert(offset + size <= m_memory.size()); assert(offset + size <= m_memory.size() || size == 0);
// TODO: Handle invalid data access by returning empty ref if (offset + size > m_memory.size())
return {};
auto dataBeg = m_memory.begin() + offset; auto dataBeg = m_memory.begin() + offset;
return {dataBeg, dataBeg + size}; return {dataBeg, dataBeg + size};
} }