1 files changed, 14 insertions, 4 deletions
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.cpp b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
index b0579a7..58cf8d2 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.cpp
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
@@ -13,4 +13,5 @@
 #include <Swiften/Base/Platform.h>
 #include <stdlib.h>
+#include <boost/numeric/conversion/cast.hpp>
 #ifdef SWIFTEN_PLATFORM_WINDOWS
 #undef UNICODE
@@ -38,5 +39,9 @@ using namespace Swift;
 namespace Swift {
 
-PlatformDomainNameServiceQuery::PlatformDomainNameServiceQuery(const std::string& service, EventLoop* eventLoop, PlatformDomainNameResolver* resolver) : PlatformDomainNameQuery(resolver), eventLoop(eventLoop), service(service) {
+PlatformDomainNameServiceQuery::PlatformDomainNameServiceQuery(const boost::optional<std::string>& serviceName, EventLoop* eventLoop, PlatformDomainNameResolver* resolver) : PlatformDomainNameQuery(resolver), eventLoop(eventLoop), serviceValid(false) {
+	if (!!serviceName) {
+		service = *serviceName;
+		serviceValid = true;
+	}
 }
 
@@ -46,4 +51,9 @@ void PlatformDomainNameServiceQuery::run() {
 
 void PlatformDomainNameServiceQuery::runBlocking() {
+	if (!serviceValid) {
+		emitError();
+		return;
+	}
+
 	SWIFT_LOG(debug) << "Querying " << service << std::endl;
 
@@ -122,5 +132,5 @@ void PlatformDomainNameServiceQuery::runBlocking() {
 			return;
 		}
-		record.priority = ns_get16(currentEntry);
+		record.priority = boost::numeric_cast<int>(ns_get16(currentEntry));
 		currentEntry += 2;
 
@@ -130,5 +140,5 @@ void PlatformDomainNameServiceQuery::runBlocking() {
 			return;
 		}
-		record.weight = ns_get16(currentEntry);
+		record.weight = boost::numeric_cast<int>(ns_get16(currentEntry));
 		currentEntry += 2;
 
@@ -138,5 +148,5 @@ void PlatformDomainNameServiceQuery::runBlocking() {
 			return;
 		}
-		record.port = ns_get16(currentEntry);
+		record.port = boost::numeric_cast<int>(ns_get16(currentEntry));
 		currentEntry += 2;