Swiftdiff options
Diffstat (limited to 'Swiften/Network/GConfProxyProvider.cpp')
| -rw-r--r-- | Swiften/Network/GConfProxyProvider.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp index eade450..7c31868 100644 --- a/Swiften/Network/GConfProxyProvider.cpp +++ b/Swiften/Network/GConfProxyProvider.cpp @@ -7,3 +7,3 @@ /* - * Copyright (c) 2016-2017 Isode Limited. + * Copyright (c) 2016-2018 Isode Limited. * All rights reserved. @@ -23,2 +23,4 @@ extern "C" { +#include <boost/numeric/conversion/cast.hpp> + #include <Swiften/Base/Log.h> @@ -52,3 +54,3 @@ HostAddressPort GConfProxyProvider::getFromGConf(const char* gcHost, const char* std::string address; - int port = 0; + unsigned short port = 0; gchar* str; @@ -58,3 +60,7 @@ HostAddressPort GConfProxyProvider::getFromGConf(const char* gcHost, const char* str = gconf_client_get_string(client, gcHost, NULL); - port = static_cast<int> (gconf_client_get_int(client, gcPort, NULL)); + try { + port = boost::numeric_cast<unsigned short>(gconf_client_get_int(client, gcPort, NULL)); + } + catch (const boost::numeric::bad_numeric_cast&) { + } |