diff options
| author | chriseth <chris@ethereum.org> | 2016-11-14 20:32:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 20:32:38 +0800 |
| commit | 9383a18c57d0f39bec00b32392bddda81309ae14 (patch) | |
| tree | 4030152469d7dd99aa2a3e4b00b9406e6786e8d7 /libsolidity/codegen | |
| parent | 4f546e6563fee688d79b37b8c68a270c380cb3e2 (diff) | |
| parent | 81f5734cbe029b93aa143e5eb7f57869ab63af7b (diff) | |
| download | dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar.gz dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar.bz2 dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar.lz dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar.xz dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.tar.zst dexon-solidity-9383a18c57d0f39bec00b32392bddda81309ae14.zip | |
Merge pull request #1334 from ethereum/enum_conversion
check enum value range during conversion
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index e064c1a6..dd133aea 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -315,6 +315,8 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp Type::Category stackTypeCategory = _typeOnStack.category(); Type::Category targetTypeCategory = _targetType.category(); + bool enumOverflowCheckPending = (targetTypeCategory == Type::Category::Enum); + switch (stackTypeCategory) { case Type::Category::FixedBytes: @@ -348,7 +350,15 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp } break; case Type::Category::Enum: - solAssert(targetTypeCategory == Type::Category::Integer || targetTypeCategory == Type::Category::Enum, ""); + solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer, ""); + if (enumOverflowCheckPending) + { + EnumType const& enumType = dynamic_cast<decltype(enumType)>(_targetType); + solAssert(enumType.numberOfMembers() > 0, "empty enum should have caused a parser error."); + m_context << u256(enumType.numberOfMembers() - 1) << Instruction::DUP2 << Instruction::GT; + m_context.appendConditionalJumpTo(m_context.errorTag()); + enumOverflowCheckPending = false; + } break; case Type::Category::FixedPoint: solAssert(false, "Not yet implemented - FixedPointType."); @@ -372,6 +382,11 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp solAssert(_typeOnStack.mobileType(), ""); // just clean convertType(_typeOnStack, *_typeOnStack.mobileType(), true); + EnumType const& enumType = dynamic_cast<decltype(enumType)>(_targetType); + solAssert(enumType.numberOfMembers() > 0, "empty enum should have caused a parser error."); + m_context << u256(enumType.numberOfMembers() - 1) << Instruction::DUP2 << Instruction::GT; + m_context.appendConditionalJumpTo(m_context.errorTag()); + enumOverflowCheckPending = false; } else if (targetTypeCategory == Type::Category::FixedPoint) { @@ -656,6 +671,8 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp solAssert(_typeOnStack == _targetType, "Invalid type conversion requested."); break; } + + solAssert(!enumOverflowCheckPending, "enum overflow checking missing."); } void CompilerUtils::pushZeroValue(Type const& _type) |