diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-05-30 15:47:20 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-30 15:46:06 -0400 |
commit | fa36aa79655f7ec76043976f3c1c207afa9bfd6f (patch) | |
tree | 3338ddf2c9a37d04f8cdd2adc2a20ebd51492978 /src | |
parent | 61fcef0f89c4eb313b94a93880d7638b90aa0764 (diff) | |
download | bitcoin-fa36aa79655f7ec76043976f3c1c207afa9bfd6f.tar.xz |
wallet: Prevent segfault when sending to unspendable witness
Diffstat (limited to 'src')
-rw-r--r-- | src/script/standard.cpp | 1 | ||||
-rw-r--r-- | src/test/script_standard_tests.cpp | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 53fcbe37de..d9269d6147 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -114,6 +114,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::v vSolutionsRet.push_back(std::move(witnessprogram)); return true; } + typeRet = TX_NONSTANDARD; return false; } diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp index ff0bf6c66d..7ab0978228 100644 --- a/src/test/script_standard_tests.cpp +++ b/src/test/script_standard_tests.cpp @@ -726,6 +726,32 @@ BOOST_AUTO_TEST_CASE(script_standard_IsMine) BOOST_CHECK(!isInvalid); } + // witness unspendable + { + CBasicKeyStore keystore; + keystore.AddKey(keys[0]); + + scriptPubKey.clear(); + scriptPubKey << OP_0 << ToByteVector(ParseHex("aabb")); + + result = IsMine(keystore, scriptPubKey, isInvalid); + BOOST_CHECK_EQUAL(result, ISMINE_NO); + BOOST_CHECK(!isInvalid); + } + + // witness unknown + { + CBasicKeyStore keystore; + keystore.AddKey(keys[0]); + + scriptPubKey.clear(); + scriptPubKey << OP_16 << ToByteVector(ParseHex("aabb")); + + result = IsMine(keystore, scriptPubKey, isInvalid); + BOOST_CHECK_EQUAL(result, ISMINE_NO); + BOOST_CHECK(!isInvalid); + } + // Nonstandard { CBasicKeyStore keystore; |