From 925d6741466a423b58cb519b6cc400863426607e Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 9 Nov 2016 15:14:16 +0100 Subject: Disallow payable internal functions. --- libsolidity/ast/Types.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libsolidity/ast') diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 395faf55..e18735d9 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -1704,7 +1704,7 @@ TypePointer TupleType::closestTemporaryType(TypePointer const& _targetType) cons FunctionType::FunctionType(FunctionDefinition const& _function, bool _isInternal): m_location(_isInternal ? Location::Internal : Location::External), m_isConstant(_function.isDeclaredConst()), - m_isPayable(_function.isPayable()), + m_isPayable(_isInternal ? false : _function.isPayable()), m_declaration(&_function) { TypePointers params; @@ -1810,6 +1810,8 @@ FunctionType::FunctionType(FunctionTypeName const& _typeName): m_isConstant(_typeName.isDeclaredConst()), m_isPayable(_typeName.isPayable()) { + if (_typeName.isPayable()) + solAssert(m_location == Location::External, "Internal payable function type used."); for (auto const& t: _typeName.parameterTypes()) { solAssert(t->annotation().type, "Type not set for parameter."); -- cgit v1.2.3