From 99da3421abcf21d405a3c42bce3b88cdf3166cac Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Thu, 12 Apr 2018 14:30:45 +0300 Subject: [PATCH] Fix issue #1757: prevent abnormal termination if failed to bind address (cherry-picked from commit 19d9e150e15ef811a2a395dbce874086c5efe216) --- src/server/server.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/server.cpp b/src/server/server.cpp index ccdf2cab9a16..fa028588467a 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -2836,7 +2836,12 @@ int main(int argc, char** argv) { } } - wesnothd::server(port, keep_alive, config_file, min_threads, max_threads).run(); + try { + wesnothd::server(port, keep_alive, config_file, min_threads, max_threads).run(); + } catch(std::exception& e) { + ERR_SERVER << "terminated by C++ exception: " << e.what() << std::endl; + return 1; + } return 0; }