Merge pull request #1109 from CJentzsch/TransactionBugFix

Transaction bug fix

libdevcore/RLP.h

@@ -242,7 +242,9 @@ public:
 		AllowNonCanon = 1,
 		ThrowOnFail = 4,
 		FailIfTooBig = 8,
+		FailIfTooSmall = 16,
 		Strict = ThrowOnFail | FailIfTooBig,
+		VeryStrict = ThrowOnFail | FailIfTooBig | FailIfTooSmall,
 		LaisezFaire = AllowNonCanon
 	};
 
@@ -269,7 +271,7 @@ public:
 
 	template <class _N> _N toHash(int _flags = Strict) const
 	{
-		if (!isData() || (length() > _N::size && (_flags & FailIfTooBig)))
+		if (!isData() || (length() > _N::size && (_flags & FailIfTooBig)) || (length() < _N::size && (_flags & FailIfTooSmall)))
 			if (_flags & ThrowOnFail)
 				BOOST_THROW_EXCEPTION(BadCast());
 			else

libethereum/Transaction.cpp

@@ -40,7 +40,7 @@ Transaction::Transaction(bytesConstRef _rlpData, CheckSignature _checkSig)
 		m_gasPrice = rlp[field = 1].toInt<u256>();
 		m_gas = rlp[field = 2].toInt<u256>();
 		m_type = rlp[field = 3].isEmpty() ? ContractCreation : MessageCall;
-		m_receiveAddress = rlp[field = 3].toHash<Address>();
+		m_receiveAddress = rlp[field = 3].isEmpty() ? Address() : rlp[field = 3].toHash<Address>(RLP::VeryStrict);
 		m_value = rlp[field = 4].toInt<u256>();
 		m_data = rlp[field = 5].toBytes();
 		byte v = rlp[field = 6].toInt<byte>() - 27;

test/TestHelper.cpp

@@ -475,11 +475,11 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun
 			}
 			catch (Exception const& _e)
 			{
-				BOOST_ERROR("Failed test with Exception: " << diagnostic_information(_e));
+				BOOST_ERROR("Failed filling test with Exception: " << diagnostic_information(_e));
 			}
 			catch (std::exception const& _e)
 			{
-				BOOST_ERROR("Failed test with Exception: " << _e.what());
+				BOOST_ERROR("Failed filling test with Exception: " << _e.what());
 			}
 			break;
 		}

test/transaction.cpp

@@ -51,7 +51,7 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin)
 			catch(...)
 			{
 				BOOST_CHECK_MESSAGE(o.count("transaction") == 0, "A transaction object should not be defined because the RLP is invalid!");
-				return;
+				continue;
 			}
 
 			BOOST_REQUIRE(o.count("transaction") > 0);
@@ -108,6 +108,11 @@ BOOST_AUTO_TEST_CASE(TransactionTest)
 	dev::test::executeTests("ttTransactionTest", "/TransactionTests", dev::test::doTransactionTests);
 }
 
+BOOST_AUTO_TEST_CASE(ttWrongRLPTransaction)
+{
+	dev::test::executeTests("ttWrongRLPTransaction", "/TransactionTests", dev::test::doTransactionTests);
+}
+
 BOOST_AUTO_TEST_CASE(tt10mbDataField)
 {
 	dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests);