aboutsummaryrefslogtreecommitdiff
path: root/src/script.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-12-27 16:42:29 -0500
committerGavin Andresen <[email protected]>2011-12-27 16:42:29 -0500
commit625b56de6491170ad6a2e45c57d974fca6160750 (patch)
tree85171eb91e4a20baecfd7b3719c428c8bad87a14 /src/script.cpp
parentFixed OP_EVAL recursion unit test, checks for both infinite and exactly-3-dee... (diff)
parentFix OP_EVAL recursion depth counting (diff)
downloaddiscoin-625b56de6491170ad6a2e45c57d974fca6160750.tar.xz
discoin-625b56de6491170ad6a2e45c57d974fca6160750.zip
Merge branch 'opevalcountfix' of https://github.com/laanwj/bitcoin
Diffstat (limited to 'src/script.cpp')
-rw-r--r--src/script.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.cpp b/src/script.cpp
index 0a1b3bb30..f576e14a8 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1033,7 +1033,7 @@ bool EvalScriptInner(vector<vector<unsigned char> >& stack, const CScript& scrip
return false;
if (!EvalScriptInner(stack, subscript, txTo, nIn, nHashType,
- pbegincodehash, pendcodehash, nOpCount, nSigOpCount, fStrictOpEval, nRecurseDepth++))
+ pbegincodehash, pendcodehash, nOpCount, nSigOpCount, fStrictOpEval, nRecurseDepth+1))
return false;
}
break;