diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
| commit | 3703150d56ff6ee557ab330e55637c9c23835902 (patch) | |
| tree | b3f13dd5416c38c508ee785dd3e543e381cc03a2 /src/main.h | |
| parent | 1bc2f0a37b68aa99e90437105a48c47046b6c0d0 (diff) | |
| parent | ca39829ecb90e392b9722292739585124ba0d7c1 (diff) | |
| download | bitcoin-3703150d56ff6ee557ab330e55637c9c23835902.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/release-process.txt
src/serialize.h
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 21bb4c8a0b..74bbe2940e 100644 --- a/src/main.h +++ b/src/main.h @@ -513,7 +513,7 @@ public: bool IsStandard() const { BOOST_FOREACH(const CTxIn& txin, vin) - if (!txin.scriptSig.IsPushOnly()) + if (txin.scriptSig.size() > 200 || !txin.scriptSig.IsPushOnly()) return error("nonstandard txin: %s", txin.scriptSig.ToString().c_str()); BOOST_FOREACH(const CTxOut& txout, vout) if (!::IsStandard(txout.scriptPubKey)) |