1 files changed, 44 insertions, 31 deletions
diff --git a/Swiften/LinkLocal/LinkLocalServiceInfo.cpp b/Swiften/LinkLocal/LinkLocalServiceInfo.cpp
index 7a7ed3b..914fab4 100644
--- a/Swiften/LinkLocal/LinkLocalServiceInfo.cpp
+++ b/Swiften/LinkLocal/LinkLocalServiceInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,40 +11,47 @@
 
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Base/Concat.h>
+#include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-ByteArray LinkLocalServiceInfo::toTXTRecord() const {
-    ByteArray result(getEncoded("txtvers=1"));
-    if (!firstName.empty()) {
-        append(result, getEncoded("1st=" + firstName));
-    }
-    if (!lastName.empty()) {
-        append(result, getEncoded("last=" + lastName));
-    }
-    if (!email.empty()) {
-        append(result, getEncoded("email=" + email));
-    }
-    if (jid.isValid()) {
-        append(result, getEncoded("jid=" + jid.toString()));
-    }
-    if (!message.empty()) {
-        append(result, getEncoded("msg=" + message));
-    }
-    if (!nick.empty()) {
-        append(result, getEncoded("nick=" + nick));
-    }
-    if (port) {
-        append(result, getEncoded("port.p2pj=" + std::string(boost::lexical_cast<std::string>(*port))));
-    }
+boost::optional<ByteArray> LinkLocalServiceInfo::toTXTRecord() const {
+    try {
+        ByteArray result(getEncoded("txtvers=1"));
+        if (!firstName.empty()) {
+            append(result, getEncoded("1st=" + firstName));
+        }
+        if (!lastName.empty()) {
+            append(result, getEncoded("last=" + lastName));
+        }
+        if (!email.empty()) {
+            append(result, getEncoded("email=" + email));
+        }
+        if (jid.isValid()) {
+            append(result, getEncoded("jid=" + jid.toString()));
+        }
+        if (!message.empty()) {
+            append(result, getEncoded("msg=" + message));
+        }
+        if (!nick.empty()) {
+            append(result, getEncoded("nick=" + nick));
+        }
+        if (port) {
+            append(result, getEncoded("port.p2pj=" + std::string(std::to_string(*port))));
+        }
 
-    switch (status) {
-        case Available: append(result, getEncoded("status=avail")); break;
-        case Away: append(result, getEncoded("status=away")); break;
-        case DND: append(result, getEncoded("status=dnd")); break;
-    }
+        switch (status) {
+            case Available: append(result, getEncoded("status=avail")); break;
+            case Away: append(result, getEncoded("status=away")); break;
+            case DND: append(result, getEncoded("status=dnd")); break;
+        }
 
-    return result;
+        return result;
+    }
+    catch (const std::exception& e) {
+        SWIFT_LOG(warning) << "Failed to create TXT record for link local service info: " << e.what() << std::endl;
+        return boost::none;
+    }
 }
 
 ByteArray LinkLocalServiceInfo::getEncoded(const std::string& s) {
@@ -82,7 +89,13 @@ LinkLocalServiceInfo LinkLocalServiceInfo::createFromTXTRecord(const ByteArray&
             info.setNick(entry.second);
         }
         else if (entry.first == "port.p2pj") {
-            info.setPort(boost::lexical_cast<int>(entry.second));
+            try {
+                info.setPort(boost::numeric_cast<unsigned short>(boost::lexical_cast<int>(entry.second)));
+            }
+            catch (const boost::bad_lexical_cast&) {
+            }
+            catch (const boost::numeric::bad_numeric_cast&) {
+            }
         }
         else if (entry.first == "status") {
             if (entry.second == "away") {