aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-09-29 14:53:58 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-09-29 15:05:42 -0700
commit38c201f47c0bc388a05cdb35d6137150fa90193e (patch)
tree04d787d9b10eb5e3464257e963cb69f3ef5579b1
parentff4cd6075b12fb32b9a906deea3ed033e3f9560a (diff)
parentcee28fbc3f0555ca41bdeff4ceec29fa62257ab8 (diff)
downloadbitcoin-38c201f47c0bc388a05cdb35d6137150fa90193e.tar.xz
Merge #11418: Add error string for CLEANSTACK script violation
cee28fbc3 Add error string for CLEANSTACK script violation, preventing an "unknown error" if the CLEANSTACK error condition is set. (Mark Friedenbach) Pull request description: This prevents an unhelpful "unknown error" from being printed in test logs if the CLEANSTACK error condition is set. Tree-SHA512: cd6764e930184aef3d662e40c67f2ea8aea8552a26d33a567d0315a19d707a82aa2afad9f48ecbb731aa5b77fbbfbd7a6a3a989fdb1424a1181350052ff2a9b5
-rw-r--r--src/script/script_error.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index c9d13c92a8..6c590f53e3 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -73,6 +73,8 @@ const char* ScriptErrorString(const ScriptError serror)
return "Witness version reserved for soft-fork upgrades";
case SCRIPT_ERR_PUBKEYTYPE:
return "Public key is neither compressed or uncompressed";
+ case SCRIPT_ERR_CLEANSTACK:
+ return "Extra items left on stack after execution";
case SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH:
return "Witness program has incorrect length";
case SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY: