diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-12-12 15:38:22 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-12-13 09:17:35 +0100 |
| commit | 89c8d2c12c4ac71f2454b8d4a04ad2dc5acd6b76 (patch) | |
| tree | b90c7193d9cab5bf4f651882d658c81beee26c33 /src | |
| parent | 76fcd9d5034143a5b041766552670d19f926097d (diff) | |
| download | bitcoin-89c8d2c12c4ac71f2454b8d4a04ad2dc5acd6b76.tar.xz | |
[Qt] Console: allow empty arguments
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/rpcconsole.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index fef15a32c6..2c5b5ee890 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -137,6 +137,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string enum CmdParseState { STATE_EATING_SPACES, + STATE_EATING_SPACES_IN_ARG, STATE_ARGUMENT, STATE_SINGLEQUOTED, STATE_DOUBLEQUOTED, @@ -220,6 +221,7 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string break; } case STATE_ARGUMENT: // In or after argument + case STATE_EATING_SPACES_IN_ARG: case STATE_EATING_SPACES: // Handle runs of whitespace switch(ch) { @@ -231,13 +233,12 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string { if (ch == '(' && stack.size() && stack.back().size() > 0) stack.push_back(std::vector<std::string>()); - if (curarg.size()) - { - // don't allow commands after executed commands on baselevel - if (!stack.size()) - throw std::runtime_error("Invalid Syntax"); - stack.back().push_back(curarg); - } + + // don't allow commands after executed commands on baselevel + if (!stack.size()) + throw std::runtime_error("Invalid Syntax"); + + stack.back().push_back(curarg); curarg.clear(); state = STATE_EATING_SPACES; } @@ -256,13 +257,12 @@ bool RPCConsole::RPCExecuteCommandLine(std::string &strResult, const std::string } break; case ' ': case ',': case '\t': - if(state == STATE_ARGUMENT) // Space ends argument + if(state == STATE_ARGUMENT || (state == STATE_EATING_SPACES_IN_ARG && ch == ',')) // Space ends argument { - if (curarg.size()) - stack.back().push_back(curarg); + stack.back().push_back(curarg); curarg.clear(); } - state = STATE_EATING_SPACES; + state = (ch == ',' ? STATE_EATING_SPACES_IN_ARG : STATE_EATING_SPACES); break; default: curarg += ch; state = STATE_ARGUMENT; } |