From ee2b5e7cb42f6eeec238ec17d8037a1341c940b0 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethdev.com>
Date: Thu, 4 Jun 2015 14:09:19 +0200
Subject: [PATCH] fixed assigning negative number to unsigned

---
 libsolidity/Types.cpp                              |  2 +-
 test/libsolidity/SolidityNameAndTypeResolution.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp
index c10e29eaa..bf79be310 100644
--- a/libsolidity/Types.cpp
+++ b/libsolidity/Types.cpp
@@ -371,7 +371,7 @@ bool IntegerConstantType::isImplicitlyConvertibleTo(Type const& _convertTo) cons
 			if (m_value <= (u256(-1) >> (256 - targetType->getNumBits() + forSignBit)))
 				return true;
 		}
-		else if (-m_value <= (u256(1) << (targetType->getNumBits() - forSignBit)))
+		else if (targetType->isSigned() && -m_value <= (u256(1) << (targetType->getNumBits() - forSignBit)))
 			return true;
 		return false;
 	}
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 4f7b82ec7..3691868cc 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -1866,6 +1866,16 @@ BOOST_AUTO_TEST_CASE(negative_integers_to_unsigned)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError);
 }
 
+BOOST_AUTO_TEST_CASE(positive_integers_to_unsigned_out_of_bound)
+{
+	char const* sourceCode = R"(
+		contract test {
+			uint8 public x = 700;
+		}
+	)";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }