diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-10-19 17:16:51 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-10-19 17:16:51 +0000 |
| commit | 5cbf75324d1509a1262b65c5073314a4da3f6d77 (patch) | |
| tree | fcaaca0e6f71362c3968735b29ea8e2e7fff9dbb /script.cpp | |
| parent | 2fad3d34b7b9bf03d56970cb36d9a091609b10c8 (diff) | |
Gavin's TEST network as -testnet switch, misc fixes
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@168 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/script.cpp b/script.cpp index 730c4986d2..a09031bad5 100644 --- a/script.cpp +++ b/script.cpp @@ -776,16 +776,11 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co return false; int nKeysCount = CastToBigNum(stacktop(-i)).getint(); - if (nKeysCount < 0) + if (nKeysCount < 0 || nKeysCount > 20) + return false; + nOpCount += nKeysCount; + if (nOpCount > 201) return false; - if (nBestHeight > 84000) - { - if (nKeysCount > 20) - return false; - nOpCount += nKeysCount; - if (nOpCount > 201) - return false; - } int ikey = ++i; i += nKeysCount; if (stack.size() < i) |