1 files changed, 34 insertions, 27 deletions
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.cpp b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
index a5d180b..2ff14e1 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.cpp
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -58,7 +58,7 @@ void PlatformDomainNameServiceQuery::runBlocking() {
         return;
     }
 
-    SWIFT_LOG(debug) << "Querying " << service << std::endl;
+    SWIFT_LOG(debug) << "Querying " << service;
 
     std::vector<DomainNameServiceQuery::Result> records;
 
@@ -97,7 +97,7 @@ void PlatformDomainNameServiceQuery::runBlocking() {
     response.resize(NS_PACKETSZ);
     int responseLength = res_query(const_cast<char*>(service.c_str()), ns_c_in, ns_t_srv, reinterpret_cast<u_char*>(vecptr(response)), response.size());
     if (responseLength == -1) {
-        SWIFT_LOG(debug) << "Error" << std::endl;
+        SWIFT_LOG(debug) << "Error";
         emitError();
         return;
     }
@@ -129,35 +129,42 @@ void PlatformDomainNameServiceQuery::runBlocking() {
         currentEntry += entryLength;
         currentEntry += NS_RRFIXEDSZ;
 
-        // Priority
-        if (currentEntry + 2 >= messageEnd) {
-            emitError();
-            return;
-        }
-        record.priority = boost::numeric_cast<int>(ns_get16(currentEntry));
-        currentEntry += 2;
-
-        // Weight
-        if (currentEntry + 2 >= messageEnd) {
-            emitError();
-            return;
+        try {
+            // Priority
+            if (currentEntry + 2 >= messageEnd) {
+                emitError();
+                return;
+            }
+            record.priority = boost::numeric_cast<int>(ns_get16(currentEntry));
+            currentEntry += 2;
+
+            // Weight
+            if (currentEntry + 2 >= messageEnd) {
+                emitError();
+                return;
+            }
+            record.weight = boost::numeric_cast<int>(ns_get16(currentEntry));
+            currentEntry += 2;
+
+            // Port
+            if (currentEntry + 2 >= messageEnd) {
+                emitError();
+                return;
+            }
+            record.port = boost::numeric_cast<unsigned short>(ns_get16(currentEntry));
+            currentEntry += 2;
+
+            // Hostname
+            if (currentEntry >= messageEnd) {
+                emitError();
+                return;
+            }
         }
-        record.weight = boost::numeric_cast<int>(ns_get16(currentEntry));
-        currentEntry += 2;
-
-        // Port
-        if (currentEntry + 2 >= messageEnd) {
+        catch (const boost::numeric::bad_numeric_cast&) {
             emitError();
             return;
         }
-        record.port = boost::numeric_cast<int>(ns_get16(currentEntry));
-        currentEntry += 2;
 
-        // Hostname
-        if (currentEntry >= messageEnd) {
-            emitError();
-            return;
-        }
         ByteArray entry;
         entry.resize(NS_MAXDNAME);
         entryLength = dn_expand(messageStart, messageEnd, currentEntry, reinterpret_cast<char*>(vecptr(entry)), entry.size());