2 files changed, 18 insertions, 7 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);
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 95ebb6d..69e6fe8 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <algorithm>
 #include <string>
 
 #include <boost/bind.hpp>
 
@@ -173,31 +173,31 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
 
         void testResolveService() {
             std::shared_ptr<DomainNameServiceQuery> query(createServiceQuery("_xmpp-client._tcp.", "xmpp-srv.test.swift.im"));
 
             query->run();
             waitForResults();
 
             CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(serviceQueryResult.size()));
             CPPUNIT_ASSERT_EQUAL(std::string("xmpp1.test.swift.im"), serviceQueryResult[0].hostname);
-            CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[0].port);
+            CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[0].port);
             CPPUNIT_ASSERT_EQUAL(0, serviceQueryResult[0].priority);
             CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[0].weight);
             CPPUNIT_ASSERT_EQUAL(std::string("xmpp-invalid.test.swift.im"), serviceQueryResult[1].hostname);
-            CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[1].port);
+            CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[1].port);
             CPPUNIT_ASSERT_EQUAL(1, serviceQueryResult[1].priority);
             CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[1].weight);
             CPPUNIT_ASSERT_EQUAL(std::string("xmpp3.test.swift.im"), serviceQueryResult[2].hostname);
-            CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[2].port);
+            CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[2].port);
             CPPUNIT_ASSERT_EQUAL(3, serviceQueryResult[2].priority);
             CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[2].weight);
             CPPUNIT_ASSERT_EQUAL(std::string("xmpp2.test.swift.im"), serviceQueryResult[3].hostname);
-            CPPUNIT_ASSERT_EQUAL(5000, serviceQueryResult[3].port);
+            CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(5000), serviceQueryResult[3].port);
             CPPUNIT_ASSERT_EQUAL(5, serviceQueryResult[3].priority);
             CPPUNIT_ASSERT_EQUAL(100, serviceQueryResult[3].weight);
         }
 
         void testResolveService_Error() {
         }
 
     private:
             std::shared_ptr<DomainNameAddressQuery> createAddressQuery(const std::string& domain) {