aboutsummaryrefslogtreecommitdiff
path: root/src/script.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2013-08-25 18:17:59 -0700
committerGavin Andresen <[email protected]>2013-08-25 18:17:59 -0700
commitb62dc051aa44ee73e24b49dd9337de2434b89710 (patch)
treef51a036053413d57e3a2e33e96b00d10cdff6a2f /src/script.cpp
parentMerge pull request #2935 from sipa/obounds (diff)
parentDocument and test OP_RESERVED weirdness (diff)
downloaddiscoin-b62dc051aa44ee73e24b49dd9337de2434b89710.tar.xz
discoin-b62dc051aa44ee73e24b49dd9337de2434b89710.zip
Merge pull request #2938 from petertodd/op-reserved-weirdness
Document and test OP_RESERVED weirdness
Diffstat (limited to 'src/script.cpp')
-rw-r--r--src/script.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script.cpp b/src/script.cpp
index 2225ef166..3c3e9cf3b 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -327,6 +327,8 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co
return false;
if (vchPushValue.size() > MAX_SCRIPT_ELEMENT_SIZE)
return false;
+
+ // Note how OP_RESERVED does not count towards the opcode limit.
if (opcode > OP_16 && ++nOpCount > 201)
return false;