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 #505 from chriseth/fixdelete

Browse Source 
Fix for bug about deleting dynamic array of structs
This commit is contained in:
Bob Summerwill 2016-04-15 11:48:09 -04:00
commit 5c3b41afb0
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/codegen/ArrayUtils.cpp
View File

@ -759,7 +759,7 @@ void ArrayUtils::clearStorageLoop(Type const& _type) const
StorageItem(m_context, _type).setToZero(SourceLocation(), false); StorageItem(m_context, _type).setToZero(SourceLocation(), false);
m_context << Instruction::POP; m_context << Instruction::POP;
// increment // increment
m_context << u256(1) << Instruction::ADD; m_context << _type.storageSize() << Instruction::ADD;
m_context.appendJumpTo(loopStart); m_context.appendJumpTo(loopStart);
// cleanup // cleanup
m_context << zeroLoopEnd; m_context << zeroLoopEnd;

22
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -6591,6 +6591,28 @@ BOOST_AUTO_TEST_CASE(index_access_with_type_conversion)
BOOST_CHECK(callContractFunction("f(uint256)", u256(0x101)).size() == 256 * 32); BOOST_CHECK(callContractFunction("f(uint256)", u256(0x101)).size() == 256 * 32);
} }
BOOST_AUTO_TEST_CASE(delete_on_array_of_structs)
{
// Test for a bug where we did not increment the counter properly while deleting a dynamic array.
char const* sourceCode = R"(
contract C {
struct S { uint x; uint[] y; }
S[] data;
function f() returns (bool) {
data.length = 2;
data[0].x = 2**200;
data[1].x = 2**200;
delete data;
return true;
}
}
)";
compileAndRun(sourceCode, 0, "C");
// This code interprets x as an array length and thus will go out of gas.
// neither of the two should throw due to out-of-bounds access
BOOST_CHECK(callContractFunction("f()") == encodeArgs(true));
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }