diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 17:01:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 17:02:07 +0200 |
| commit | 041dad94b047313a17edb0324742cf80cfd550f1 (patch) | |
| tree | f4e34df3da18cc483dac5c123726854261873ad2 /src/rpc/net.cpp | |
| parent | fd2814ef1182834d4471223adfc36ec10d28d908 (diff) | |
| parent | 4dc1915bceacb94446454428da676772290b8c48 (diff) | |
| download | bitcoin-041dad94b047313a17edb0324742cf80cfd550f1.tar.xz | |
Merge #10783: [RPC] Various rpc argument fixes
4dc1915 check for null values in rpc args and handle appropriately (Gregory Sanders)
999ef20 importmulti options are optional (Gregory Sanders)
a70d025 fixup some rpc param counting for rpc help (Gregory Sanders)
Pull request description:
Audited where named args will fail to use correct default values or may fail when additional optional arguments are added.
Previously for these parameters, it was fine to omit them as positional arguments, but it would trigger UniValue runtime errors to set them to null, or to omit them while passing named parameters with greater positions (which would internally set earlier missing arguments to null). Now null values are treated the same as missing values so these errors do not occur.
Included a few other small fixes while working on it.
I didn't bother fixing account-based rpc calls.
Tree-SHA512: 8baf781a35bd48de7878d4726850a580dab80323d3416c1c146b4fa9062f8a233c03f37e8ae3f3159e9d04a8f39c326627ca64c14e1cb7ce72538f934ab2ae1e
Diffstat (limited to 'src/rpc/net.cpp')
| -rw-r--r-- | src/rpc/net.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 090d9e448e..b4d6795e62 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -310,7 +310,7 @@ UniValue getaddednodeinfo(const JSONRPCRequest& request) std::vector<AddedNodeInfo> vInfo = g_connman->GetAddedNodeInfo(); - if (request.params.size() == 1) { + if (request.params.size() == 1 && !request.params[0].isNull()) { bool found = false; for (const AddedNodeInfo& info : vInfo) { if (info.strAddedNode == request.params[0].get_str()) { |