sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return error when importmulti called with invalid address.

Browse Source 
Lack of error checking noticed by Alex Morcos <morcos@chaincode.com>
This commit is contained in:
Russell Yanofsky 2017-02-13 17:54:51 -05:00
parent d978c41e1e
commit 9acf25cc01
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qa/rpc-tests/importmulti.py
View File

@ -59,6 +59,16 @@ class ImportMultiTest (BitcoinTestFramework):
assert_equal(address_assert['iswatchonly'], True) assert_equal(address_assert['iswatchonly'], True)
assert_equal(address_assert['ismine'], False) assert_equal(address_assert['ismine'], False)
print("Should not import an invalid address")
result = self.nodes[1].importmulti([{
"scriptPubKey": {
"address": "not valid address",
},
"timestamp": "now",
}])
assert_equal(result[0]['success'], False)
assert_equal(result[0]['error']['code'], -5)
assert_equal(result[0]['error']['message'], 'Invalid address')
# ScriptPubKey + internal # ScriptPubKey + internal
print("Should import a scriptPubKey with internal flag") print("Should import a scriptPubKey with internal flag")

3
src/wallet/rpcdump.cpp
View File

@ -671,6 +671,9 @@ UniValue processImport(const UniValue& data) {
if (!isScript) { if (!isScript) {
address = CBitcoinAddress(output); address = CBitcoinAddress(output);
if (!address.IsValid()) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
}
script = GetScriptForDestination(address.Get()); script = GetScriptForDestination(address.Get());
} else { } else {
if (!IsHex(output)) { if (!IsHex(output)) {