From f40ede375016051d9026710122a40a5bbdd93c9f Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 1 May 2007 19:41:27 +0000
Subject: Fix crashbug in latest svn introduced by inspsocket cull list, which
 can cause a crash if the connection times out and an error occurs on the
 socket before its deleted

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6855 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/inspsocket.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/inspsocket.cpp')

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 3c30fd6e8..cdc0dc26f 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -582,13 +582,9 @@ void SocketTimeout::Tick(time_t now)
 
 		if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
 			ServerInstance->SocketCull[this->sock] = this->sock;
-
-		return;
-	}
-	else
-	{
-		this->sock->Timeout = NULL;
 	}
+
+	this->sock->Timeout = NULL;
 }
 
 bool InspSocket::Poll()
-- 
cgit v1.2.3