aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-02-20 09:43:55 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-02-20 09:51:38 +0100
commita026a56c4eb558e9c85d90854ad06f8155c45e91 (patch)
tree2936945f3868fd22965eb24d57952bf520d08c6c
parent07f4386b387caddd82502d575cc9dba80b81d9f2 (diff)
parente5d9d77df2de715d24638e3bab78750b7ad3e1fd (diff)
Merge #5706: fix crash: RPC \
e5d9d77 fix crash: createmultisig and addmultisigaddress (fsb4000)
-rw-r--r--src/rpcmisc.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 8d260b1cc9..2eda4d3355 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -228,6 +228,8 @@ CScript _createmultisig_redeemScript(const Array& params)
throw runtime_error(
strprintf("not enough keys supplied "
"(got %u keys, but need at least %d to redeem)", keys.size(), nRequired));
+ if (keys.size() > 16)
+ throw runtime_error("Number of addresses involved in the multisignature address creation > 16\nReduce the number");
std::vector<CPubKey> pubkeys;
pubkeys.resize(keys.size());
for (unsigned int i = 0; i < keys.size(); i++)