diff options
| author | Johnson Lau <jl2012@xbt.hk> | 2016-09-23 13:06:45 +0800 |
|---|---|---|
| committer | Johnson Lau <jl2012@xbt.hk> | 2016-09-23 13:07:38 +0800 |
| commit | c72c5b1e3bd42e84465677e94aa83316ff3d9a14 (patch) | |
| tree | 4b53ce9d63e5292b79e4699437ab69d38d17bcbd /src/script/interpreter.cpp | |
| parent | 2b514aa2eae61839ad162b2f6e5ba69ef96c5c97 (diff) | |
| download | bitcoin-c72c5b1e3bd42e84465677e94aa83316ff3d9a14.tar.xz | |
Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 47ea261e31..fd356fed0a 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -428,6 +428,12 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un if (stack.size() < 1) return set_error(serror, SCRIPT_ERR_UNBALANCED_CONDITIONAL); valtype& vch = stacktop(-1); + if (sigversion == SIGVERSION_WITNESS_V0 && (flags & SCRIPT_VERIFY_MINIMALIF)) { + if (vch.size() > 1) + return set_error(serror, SCRIPT_ERR_MINIMALIF); + if (vch.size() == 1 && vch[0] != 1) + return set_error(serror, SCRIPT_ERR_MINIMALIF); + } fValue = CastToBool(vch); if (opcode == OP_NOTIF) fValue = !fValue; |