From a39269e11e7c2d1843a4a4bf67749ae0224e4830 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Sep 2016 16:31:04 +0200
Subject: Fix infinite loop when receiving incomplete headers

---
 src/client/net/serverconnection.cpp | 6 ++++--
 src/client/net/serverdiscovery.cpp  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/client/net')

diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index c6ffd8c..54d95bc 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -379,15 +379,17 @@ void ServerConnection::sock_dataArrival()
 		return;
 	}
 
-	while (_socket->bytesAvailable())
+	while (_socket->bytesAvailable() > 0)
 	{
 		bool retval;
 		retval = _fromServer.readMessage(_socket); // let the message read data from socket
-		if (!retval)   // error parsing msg, disconnect client!
+		if (retval == NM_READ_FAILED)   // error parsing msg, disconnect client!
 		{
 			this->disconnectFromServer();
 			return;
 		}
+		if (retval == NM_READ_INCOMPLETE)
+			return;
 		if (_fromServer.readComplete())   // message is complete
 		{
 			this->handleMsg();
diff --git a/src/client/net/serverdiscovery.cpp b/src/client/net/serverdiscovery.cpp
index 5dba327..1d1e891 100644
--- a/src/client/net/serverdiscovery.cpp
+++ b/src/client/net/serverdiscovery.cpp
@@ -161,7 +161,7 @@ void ServerDiscovery::onUdpReadyRead()
 			continue;
 
 		_packet.reset();
-		if (!_packet.readMessage(data, (quint32)size))
+		if (_packet.readMessage(data, (quint32)size) != NM_READ_OK)
 			continue;
 
 		// Valid packet, process it:
-- 
cgit v1.2.3-55-g7522