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

Disallow setting .gas() on .transfer()

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-02-24 00:27:36 +00:00
parent 59514d8268
commit 4d290e551c
3 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/ast/Types.cpp
View File

@ -2315,10 +2315,9 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con
case Location::Bare:
case Location::BareCallCode:
case Location::BareDelegateCall:
case Location::Transfer:
{
MemberList::MemberMap members;
if (m_location != Location::BareDelegateCall && m_location != Location::DelegateCall && m_location != Location::Transfer)
if (m_location != Location::BareDelegateCall && m_location != Location::DelegateCall)
{
if (m_isPayable)
members.push_back(MemberList::Member(

12
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -620,19 +620,15 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
_functionCall.expression().accept(*this);
// Provide the gas stipend manually at first because we may send zero ether.
// Will be zeroed if we send more than zero ether.
if (!function.gasSet())
m_context << u256(eth::GasCosts::callStipend);
m_context << u256(eth::GasCosts::callStipend);
arguments.front()->accept(*this);
utils().convertType(
*arguments.front()->annotation().type,
*function.parameterTypes().front(), true
);
if (!function.gasSet())
{
// gas <- gas * !value
m_context << Instruction::SWAP1 << Instruction::DUP2;
m_context << Instruction::ISZERO << Instruction::MUL << Instruction::SWAP1;
}
// gas <- gas * !value
m_context << Instruction::SWAP1 << Instruction::DUP2;
m_context << Instruction::ISZERO << Instruction::MUL << Instruction::SWAP1;
appendExternalFunctionCall(
FunctionType(
TypePointers{},

17
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -1693,10 +1693,6 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
function b(address addr, uint amount) {
addr.transfer(amount);
}
function c(address addr, uint amount, uint gas) returns (uint) {
addr.transfer.gas(gas)(amount);
return this.balance;
}
}
contract B {
@ -1707,22 +1703,11 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
throw;
}
}
contract D {
// This takes about ~3600 gas, which exceeds the 2300 gas stipend.
function () payable {
bytes32 tmp = 1;
for (uint i = 0; i < 20; i++)
tmp = sha3(tmp);
}
}
)";
compileAndRun(sourceCode, 0, "B");
u160 const nonPayableRecipient = m_contractAddress;
compileAndRun(sourceCode, 0, "C");
u160 const oogRecipient = m_contractAddress;
compileAndRun(sourceCode, 0, "D");
u160 const expensiveRecipient = m_contractAddress;
compileAndRun(sourceCode, 20, "A");
u160 payableRecipient(23);
BOOST_CHECK(callContractFunction("a(address,uint256)", payableRecipient, 10) == encodeArgs(10));
@ -1730,8 +1715,6 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
BOOST_CHECK(callContractFunction("b(address,uint256)", nonPayableRecipient, 10) == encodeArgs());
BOOST_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10) == encodeArgs());
BOOST_CHECK(callContractFunction("c(address,uint256,uint256)", expensiveRecipient, 1, 9000) == encodeArgs(9));
BOOST_CHECK(callContractFunction("c(address,uint256,uint256)", expensiveRecipient, 1, 0) == encodeArgs());
}
BOOST_AUTO_TEST_CASE(log0)