aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2012-08-25 11:05:59 -0400
committerGavin Andresen <[email protected]>2012-08-25 11:05:59 -0400
commit9db9642db4d830dfeec5ad6a55c02a441a23b0b7 (patch)
treebd2d51a745eefb317c82d10d6d3c603a31349f67 /src/main.cpp
parentMerge branch 'checkpoint' (diff)
parentMake 0-value outputs non-standard (diff)
downloaddiscoin-9db9642db4d830dfeec5ad6a55c02a441a23b0b7.tar.xz
discoin-9db9642db4d830dfeec5ad6a55c02a441a23b0b7.zip
Merge branch 'nozeroout' of git://github.com/sipa/bitcoin
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 56596ef18..f71cfe7ca 100644
--- 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;
}