(svn r15206) -Fix [FS#2567]: memory corruption due to not properly cleanup up the mess when cancelling a download

1 files changed, 8 insertions, 1 deletions

diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp
index 9c58af2c0..963257847 100644
--- a/src/network/core/tcp.cpp
+++ b/src/network/core/tcp.cpp
@@ -20,7 +20,14 @@ NetworkTCPSocketHandler::NetworkTCPSocketHandler(SOCKET s) :
 
 NetworkTCPSocketHandler::~NetworkTCPSocketHandler()
 {
+	this->CloseConnection();
+
 	if (this->sock != INVALID_SOCKET) closesocket(this->sock);
+	this->sock = INVALID_SOCKET;
+}
+
+NetworkRecvStatus NetworkTCPSocketHandler::CloseConnection()
+{
 	this->writable = false;
 	this->has_quit = true;
 
@@ -33,7 +40,7 @@ NetworkTCPSocketHandler::~NetworkTCPSocketHandler()
 	delete this->packet_recv;
 	this->packet_recv = NULL;
 
-	this->sock = INVALID_SOCKET;
+	return NETWORK_RECV_STATUS_OKAY;
 }
 
 /**