Permalink
Browse files

Merge pull request #6970

2980a18 Fix crash in validateaddress with -disablewallet (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Nov 9, 2015
2 parents 4ee149a + 2980a18 commit 92701b3b891884706390c2bfff3209310656aa1e
Showing with 35 additions and 2 deletions.
  1. +1 −0 qa/pull-tester/rpc-tests.py
  2. +32 −0 qa/rpc-tests/disablewallet.py
  3. +2 −2 src/rpcmisc.cpp
@@ -68,6 +68,7 @@
'decodescript.py',
'p2p-fullblocktest.py',
'blockchain.py',
+ 'disablewallet.py',
]
testScriptsExt = [
'bip65-cltv.py',
@@ -0,0 +1,32 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Exercise API with -disablewallet.
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+class DisableWalletTest (BitcoinTestFramework):
+
+ def setup_chain(self):
+ print("Initializing test directory "+self.options.tmpdir)
+ initialize_chain_clean(self.options.tmpdir, 1)
+
+ def setup_network(self, split=False):
+ self.nodes = start_nodes(1, self.options.tmpdir, [['-disablewallet']])
+ self.is_network_split = False
+ self.sync_all()
+
+ def run_test (self):
+ # Check regression: https://github.com/bitcoin/bitcoin/issues/6963#issuecomment-154548880
+ x = self.nodes[0].validateaddress('3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
+ assert(x['isvalid'] == False)
+ x = self.nodes[0].validateaddress('mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
+ assert(x['isvalid'] == True)
+
+if __name__ == '__main__':
+ DisableWalletTest ().main ()
View
@@ -117,7 +117,7 @@ class DescribeAddressVisitor : public boost::static_visitor<UniValue>
UniValue obj(UniValue::VOBJ);
CPubKey vchPubKey;
obj.push_back(Pair("isscript", false));
- if (pwalletMain->GetPubKey(keyID, vchPubKey)) {
+ if (pwalletMain && pwalletMain->GetPubKey(keyID, vchPubKey)) {
obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
}
@@ -128,7 +128,7 @@ class DescribeAddressVisitor : public boost::static_visitor<UniValue>
UniValue obj(UniValue::VOBJ);
CScript subscript;
obj.push_back(Pair("isscript", true));
- if (pwalletMain->GetCScript(scriptID, subscript)) {
+ if (pwalletMain && pwalletMain->GetCScript(scriptID, subscript)) {
std::vector<CTxDestination> addresses;
txnouttype whichType;
int nRequired;

0 comments on commit 92701b3

Please sign in to comment.