Merge pull request #2938 from petertodd/op-reserved-weirdness

Document and test OP_RESERVED weirdness
2013-08-25 18:17:59 -07:00
parent 8a9e538227 214d45b6b9
commit b62dc051aa
5 changed files with 18 additions and 3 deletions
--- 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;