aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-08-25 11:05:59 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-08-25 11:05:59 -0400
commit9db9642db4d830dfeec5ad6a55c02a441a23b0b7 (patch)
treebd2d51a745eefb317c82d10d6d3c603a31349f67
parentb9c078ea965867a7b201cdc1d5131fc6bc01fe14 (diff)
parent65ce215641a213cd085671a32c62cb35a9d1de62 (diff)
Merge branch 'nozeroout' of git://github.com/sipa/bitcoin
-rw-r--r--src/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 56596ef183..f71cfe7caa 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;
}