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

Add payable check for constructor in codegen

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-11-15 10:24:53 +00:00
parent b46a14f4a8
commit ceeb8f4a2b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsolidity/codegen/ContractCompiler.cpp
View File

@ -137,6 +137,12 @@ void ContractCompiler::appendInitAndConstructorCode(ContractDefinition const& _c
appendConstructor(*constructor); appendConstructor(*constructor);
else if (auto c = m_context.nextConstructor(_contract)) else if (auto c = m_context.nextConstructor(_contract))
appendBaseConstructor(*c); appendBaseConstructor(*c);
else
{
// Throw if function is not payable but call contained ether.
m_context << Instruction::CALLVALUE;
m_context.appendConditionalJumpTo(m_context.errorTag());
}
} }
size_t ContractCompiler::packIntoContractCreator(ContractDefinition const& _contract) size_t ContractCompiler::packIntoContractCreator(ContractDefinition const& _contract)
@ -184,6 +190,12 @@ void ContractCompiler::appendBaseConstructor(FunctionDefinition const& _construc
void ContractCompiler::appendConstructor(FunctionDefinition const& _constructor) void ContractCompiler::appendConstructor(FunctionDefinition const& _constructor)
{ {
CompilerContext::LocationSetter locationSetter(m_context, _constructor); CompilerContext::LocationSetter locationSetter(m_context, _constructor);
if (!_constructor.isPayable())
{
// Throw if function is not payable but call contained ether.
m_context << Instruction::CALLVALUE;
m_context.appendConditionalJumpTo(m_context.errorTag());
}
// copy constructor arguments from code to memory and then to stack, they are supplied after the actual program // copy constructor arguments from code to memory and then to stack, they are supplied after the actual program
if (!_constructor.parameters().empty()) if (!_constructor.parameters().empty())
{ {