epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: Possible crash

Browse Source
This commit is contained in:
geckosoft
2010-11-01 05:14:41 +01:00
committed by Chris Forbes
parent 60a8acf4d4
commit c30050396a
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/Server/Server.cs
View File

@@ -211,13 +211,30 @@ namespace OpenRA.Server
static void AcceptConnection() static void AcceptConnection()
{ {
var newConn = new Connection { socket = listener.AcceptSocket() }; Socket newSocket = null;
try
{
if (!listener.Server.IsBound) return;
newSocket = listener.AcceptSocket();
}catch
{
/* could have an exception here when listener 'goes away' when calling AcceptConnection! */
/* alternative would be to use locking but the listener doesnt go away without a reason */
return;
}
var newConn = new Connection { socket = newSocket };
if (Game.Settings.Server.Extension != null && !Game.Settings.Server.Extension.OnValidateConnection(GameStarted, newConn)) if (Game.Settings.Server.Extension != null && !Game.Settings.Server.Extension.OnValidateConnection(GameStarted, newConn))
{ {
DropClient(newConn, new Exception() ); DropClient(newConn, new Exception() );
return; return;
} }
try try
{ {
if (GameStarted) if (GameStarted)