Merge branch 'TheBlueMatt-setaccountfix' into integration

2011-03-05 17:26:14 +01:00 · 2011-03-05 17:26:14 +01:00 · b104df742d
commit b104df742d
parent f36b494aeb 8e5aaada2e
1 changed files with 6 additions and 0 deletions
--- a/rpc.cpp
+++ b/rpc.cpp
@ -381,6 +381,12 @@ Value setaccount(const Array& params, bool fHelp)
            "Sets the account associated with the given address.");

    string strAddress = params[0].get_str();
+    uint160 hash160;
+    bool isValid = AddressToHash160(strAddress, hash160);
+    if (!isValid)
+        throw JSONRPCError(-5, "Invalid bitcoin address");
+
+
    string strAccount;
    if (params.size() > 1)
        strAccount = AccountFromValue(params[1]);