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

This commit is contained in:
Gavin Andresen 2012-08-25 11:05:59 -04:00
commit 9db9642db4

View file

@ -281,9 +281,12 @@ bool CTransaction::IsStandard() const
if (!txin.scriptSig.IsPushOnly()) if (!txin.scriptSig.IsPushOnly())
return false; return false;
} }
BOOST_FOREACH(const CTxOut& txout, vout) BOOST_FOREACH(const CTxOut& txout, vout) {
if (!::IsStandard(txout.scriptPubKey)) if (!::IsStandard(txout.scriptPubKey))
return false; return false;
if (txout.nValue == 0)
return false;
}
return true; return true;
} }