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 #118 from chriseth/rejectEtherSentToLibrary

Browse Source 
Reject ether sent to library.
This commit is contained in:
chriseth 2015-10-07 16:41:49 +02:00
commit 8644ad6866
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/Compiler.cpp
View File

@ -260,6 +260,9 @@ void Compiler::appendFunctionSelector(ContractDefinition const& _contract)
m_context << returnTag;
appendReturnValuePacker(FunctionType(*fallback).returnParameterTypes(), _contract.isLibrary());
}
else if (_contract.isLibrary())
// Reject invalid library calls and ether sent to a library.
m_context.appendJumpTo(m_context.errorTag());
else
m_context << eth::Instruction::STOP; // function not found

23
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -5578,6 +5578,29 @@ BOOST_AUTO_TEST_CASE(version_stamp_for_libraries)
BOOST_CHECK_EQUAL(runtimeCode[7], int(eth::Instruction::POP));
}
BOOST_AUTO_TEST_CASE(reject_ether_sent_to_library)
{
char const* sourceCode = R"(
library lib {}
contract c {
function f(address x) returns (bool) {
return x.send(1);
}
}
)";
compileAndRun(sourceCode, 0, "lib");
Address libraryAddress = m_contractAddress;
compileAndRun(sourceCode, 10, "c");
BOOST_CHECK_EQUAL(m_state.balance(m_contractAddress), 10);
BOOST_CHECK_EQUAL(m_state.balance(libraryAddress), 0);
BOOST_CHECK(callContractFunction("f(address)", encodeArgs(u160(libraryAddress))) == encodeArgs(false));
BOOST_CHECK_EQUAL(m_state.balance(m_contractAddress), 10);
BOOST_CHECK_EQUAL(m_state.balance(libraryAddress), 0);
BOOST_CHECK(callContractFunction("f(address)", encodeArgs(u160(m_contractAddress))) == encodeArgs(true));
BOOST_CHECK_EQUAL(m_state.balance(m_contractAddress), 10);
BOOST_CHECK_EQUAL(m_state.balance(libraryAddress), 0);
}
BOOST_AUTO_TEST_SUITE_END()
}