From 2cd966f5664ca129c0a77a3b28813149c4ee2071 Mon Sep 17 00:00:00 2001
From: LaurentGom <LaurentGom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Sat, 16 Oct 2010 08:47:27 +0000
Subject: [PATCH] Fixed a bug in sf::UdpSocket::Receive(sf::Packet&) with
 non-blocking sockets (incorrect packets were sometimes returned)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1583 4e206d99-4929-0410-ac5d-dfc041789085
---
 src/SFML/Network/UdpSocket.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp
index ff80591f1..52aed7fda 100644
--- a/src/SFML/Network/UdpSocket.cpp
+++ b/src/SFML/Network/UdpSocket.cpp
@@ -190,10 +190,10 @@ Socket::Status UdpSocket::Receive(Packet& packet, IpAddress& remoteAddress, unsi
 
     // Receive datagrams
     std::size_t received = 0;
+    std::size_t size = myPendingPacket.Data.size();
     do
     {
         // Make room in the data buffer for a new datagram
-        std::size_t size = myPendingPacket.Data.size();
         myPendingPacket.Data.resize(size + MaxDatagramSize);
         char* data = &myPendingPacket.Data[0] + size;
 
@@ -202,12 +202,15 @@ Socket::Status UdpSocket::Receive(Packet& packet, IpAddress& remoteAddress, unsi
 
         // Check for errors
         if (status != Done)
+        {
+            myPendingPacket.Data.resize(size + received);
             return status;
+        }
     }
     while (received == MaxDatagramSize);
 
     // We have received all the packet data: we can copy it to the user packet
-    std::size_t actualSize = myPendingPacket.Data.size() - MaxDatagramSize + received;
+    std::size_t actualSize = size + received;
     if (actualSize > 0)
         packet.OnReceive(&myPendingPacket.Data[0], actualSize);