1 files changed, 10 insertions, 1 deletions

diff --git a/main.h b/main.h
index 8ed3ef228b..771b21bfcd 100644
--- a/main.h
+++ b/main.h
@@ -18,6 +18,7 @@ static const unsigned int MAX_SIZE = 0x02000000;
 static const unsigned int MAX_BLOCK_SIZE = 1000000;

 static const int64 COIN = 100000000;

 static const int64 CENT = 1000000;

+static const int64 MAX_MONEY = 21000000 * COIN;

 static const int COINBASE_MATURITY = 100;

 

 static const CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);

@@ -471,10 +472,18 @@ public:
         if (vin.empty() || vout.empty())

             return error("CTransaction::CheckTransaction() : vin or vout empty");

 

-        // Check for negative values

+        // Check for negative or overflow output values

+        int64 nValueOut = 0;

         foreach(const CTxOut& txout, vout)

+        {

             if (txout.nValue < 0)

                 return error("CTransaction::CheckTransaction() : txout.nValue negative");

+            if (txout.nValue > MAX_MONEY)

+                return error("CTransaction::CheckTransaction() : txout.nValue too high");

+            nValueOut += txout.nValue;

+            if (nValueOut > MAX_MONEY)

+                return error("CTransaction::CheckTransaction() : txout total too high");

+        }

 

         if (IsCoinBase())

         {