diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-07 10:10:01 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-07 10:16:09 +0200 |
commit | 4ae5e72128f605d0fc25bba1d42c0434375d712e (patch) | |
tree | c68e11bcbe036d94eed2712daa29a058354c76ab /src/bitcoind.cpp | |
parent | f4e1c347cf1861595609ba841d35c4a59b50bde2 (diff) |
Show error message if ReadConfigFile fails
A runaway exception was raised if ReadConfigFile fails (usually
due to a parse error in bitcoin.conf). Show an error message instead.
Fixes #4013.
Diffstat (limited to 'src/bitcoind.cpp')
-rw-r--r-- | src/bitcoind.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 4882a00532..17aa0c9d4b 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -70,7 +70,13 @@ bool AppInit(int argc, char* argv[]) fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str()); return false; } - ReadConfigFile(mapArgs, mapMultiArgs); + try + { + ReadConfigFile(mapArgs, mapMultiArgs); + } catch(std::exception &e) { + fprintf(stderr,"Error reading configuration file: %s\n", e.what()); + return false; + } // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause) if (!SelectParamsFromCommandLine()) { fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); |