1 files changed, 13 insertions, 2 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 5cb1765..c5117fa 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -1,19 +1,20 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <iostream>
 #include <thread>
 
 #include <boost/bind.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Client/Client.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
 #include <Swiften/Network/BoostNetworkFactories.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Roster/GetRosterRequest.h>
 
@@ -68,19 +69,29 @@ int main(int, char**) {
         return -1;
     }
 
     char* boshHost = getenv("SWIFT_CLIENTTEST_BOSH_HOST");
     char* boshPort = getenv("SWIFT_CLIENTTEST_BOSH_PORT");
     char* boshPath = getenv("SWIFT_CLIENTTEST_BOSH_PATH");
 
     if (boshHost && boshPort && boshPath) {
         std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << boshPath << std::endl;
-        options.boshURL = URL("http", boshHost, atoi(boshPort), boshPath);
+        try {
+            options.boshURL = URL("http", boshHost, boost::numeric_cast<unsigned short>(boost::lexical_cast<int>(boshPort)), boshPath);
+        }
+        catch (const boost::numeric::bad_numeric_cast& e) {
+            std::cerr << "SWIFT_CLIENTTEST_BOSH_PORT doesn't hold a valid port number: " << e.what() << std::endl;
+            return -1;
+        }
+        catch (const boost::bad_lexical_cast& e) {
+            std::cerr << "SWIFT_CLIENTTEST_BOSH_PORT doesn't hold a valid port number: " << e.what() << std::endl;
+            return -1;
+        }
     }
 
     client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
     ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.isEmpty());
     client->onConnected.connect(&handleConnected);
     client->onDisconnected.connect(boost::bind(&handleDisconnected, _1));
     client->setAlwaysTrustCertificates();
     stage = FirstConnect;
     client->connect(options);