diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-09-30 16:23:07 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-09-30 16:23:07 +0000 |
| commit | a790fa46f40d751307f86c37a709eb119768ce5b (patch) | |
| tree | 7908fc58d6ce8b54461dadd8ac7f1ba74c9271a7 /script.cpp | |
| parent | 9b8eb4d6907502e9b1e74b62a850a11655d50ab5 (diff) | |
| download | bitcoin-a790fa46f40d751307f86c37a709eb119768ce5b.tar.xz | |
don't count or spend payments until they have 1 confirmation,
misc cleanup,
changed internal version number from 312 to 31300
-- version 0.3.13
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@158 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/script.cpp b/script.cpp index 9b30d5a1a4..730c4986d2 100644 --- a/script.cpp +++ b/script.cpp @@ -778,6 +778,14 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co int nKeysCount = CastToBigNum(stacktop(-i)).getint(); if (nKeysCount < 0) 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) |