Merge pull request #2473 from chriseth/sol_fix_exponentialNotation

Check whether a literal is a valid literal before using it.

1 files changed, 15 insertions, 0 deletions

diff --git a/Types.cpp b/Types.cpp
index 0ecb01d2..91ef16b5 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -210,6 +210,8 @@ TypePointer Type::forLiteral(Literal const& _literal)
 	case Token::FalseLiteral:
 		return make_shared<BoolType>();
 	case Token::Number:
+		if (!IntegerConstantType::isValidLiteral(_literal))
+			return TypePointer();
 		return make_shared<IntegerConstantType>(_literal);
 	case Token::StringLiteral:
 		return make_shared<StringLiteralType>(_literal);
@@ -321,6 +323,19 @@ const MemberList IntegerType::AddressMemberList({
 	{"send", make_shared<FunctionType>(strings{"uint"}, strings{"bool"}, FunctionType::Location::Send)}
 });
 
+bool IntegerConstantType::isValidLiteral(const Literal& _literal)
+{
+	try
+	{
+		bigint x(_literal.getValue());
+	}
+	catch (...)
+	{
+		return false;
+	}
+	return true;
+}
+
 IntegerConstantType::IntegerConstantType(Literal const& _literal)
 {
 	m_value = bigint(_literal.getValue());