Merge #9756: Return error when importmulti called with invalid address.

9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
2017-02-15 15:31:04 +01:00
parent 476cc47da0 9acf25cc01
commit 7a93af8340
2 changed files with 13 additions and 0 deletions
@@ -672,6 +672,9 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)

        if (!isScript) {
            address = CBitcoinAddress(output);
+            if (!address.IsValid()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+            }
            script = GetScriptForDestination(address.Get());
        } else {
            if (!IsHex(output)) {