1 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp
index e639e20..a405e0e 100644
--- a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp
+++ b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp
@@ -1,24 +1,25 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h>
 
 #include <boost/lexical_cast.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
     JingleS5BTransportMethodPayloadParser::JingleS5BTransportMethodPayloadParser() : level(0) {
 
     }
 
@@ -34,22 +35,22 @@ namespace Swift {
                 SWIFT_LOG(warning) << "Unknown S5B mode; falling back to defaul!";
                 getPayloadInternal()->setMode(JingleS5BTransportPayload::TCPMode);
             }
             getPayloadInternal()->setDstAddr(attributes.getAttributeValue("dstaddr").get_value_or(""));
         } else if (level == 1) {
             if (element == "candidate") {
                 JingleS5BTransportPayload::Candidate candidate;
                 candidate.cid = attributes.getAttributeValue("cid").get_value_or("");
 
-                int port = -1;
+                unsigned short port = 0;
                 try {
-                    port = boost::lexical_cast<int>(attributes.getAttributeValue("port").get_value_or("-1"));
-                } catch(boost::bad_lexical_cast &) { }
+                    port = boost::numeric_cast<unsigned short>(boost::lexical_cast<int>(attributes.getAttributeValue("port").get_value_or("0")));
+                } catch(...) { }
                 candidate.hostPort = HostAddressPort(HostAddress::fromString(attributes.getAttributeValue("host").get_value_or("")).get_value_or(HostAddress()), port);
                 candidate.jid = JID(attributes.getAttributeValue("jid").get_value_or(""));
                 int priority = -1;
                 try {
                     priority = boost::lexical_cast<int>(attributes.getAttributeValue("priority").get_value_or("-1"));
                 } catch(boost::bad_lexical_cast &) { }
                 candidate.priority = priority;
                 candidate.type = stringToType(attributes.getAttributeValue("type").get_value_or("direct"));