Merge branch 'nozeroout' of git://github.com/sipa/bitcoin

2012-08-25 11:05:59 -04:00 · 2012-08-25 11:05:59 -04:00 · 9db9642db4
parent b9c078ea96 65ce215641
commit 9db9642db4
1 changed files with 4 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -281,9 +281,12 @@ bool CTransaction::IsStandard() const
        if (!txin.scriptSig.IsPushOnly())
            return false;
    }
-    BOOST_FOREACH(const CTxOut& txout, vout)
+    BOOST_FOREACH(const CTxOut& txout, vout) {
        if (!::IsStandard(txout.scriptPubKey))
            return false;
+        if (txout.nValue == 0)
+            return false;
+    }
    return true;
 }