From 28f6b8dbad27f0dac72daca6f1bfe41d7e701908 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 25 Aug 2013 22:02:57 -0400 Subject: [PATCH] RPC validateaddress: test pwalletMain for NULL (no-wallet mode) --- src/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 4bf358032..cafb6db9b 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1479,13 +1479,13 @@ Value validateaddress(const Array& params, bool fHelp) CTxDestination dest = address.Get(); string currentAddress = address.ToString(); ret.push_back(Pair("address", currentAddress)); - bool fMine = IsMine(*pwalletMain, dest); + bool fMine = pwalletMain ? IsMine(*pwalletMain, dest) : false; ret.push_back(Pair("ismine", fMine)); if (fMine) { Object detail = boost::apply_visitor(DescribeAddressVisitor(), dest); ret.insert(ret.end(), detail.begin(), detail.end()); } - if (pwalletMain->mapAddressBook.count(dest)) + if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); } return ret;