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

Fix shellmap OrderManager use after dispose.

Browse Source
This commit is contained in:
Paul Chote
2021-08-25 12:38:10 +01:00
committed by abcdefg30
parent 8f412f869d
commit e0e219793f
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Game/Network/Connection.cs
View File

@@ -45,6 +45,7 @@ namespace OpenRA.Network
readonly Queue<(int Frame, int SyncHash, ulong DefeatState)> sync = new Queue<(int, int, ulong)>();
readonly Queue<(int Frame, OrderPacket Orders)> orders = new Queue<(int, OrderPacket)>();
readonly Queue<OrderPacket> immediateOrders = new Queue<OrderPacket>();
bool disposed;
int IConnection.LocalClientId => LocalClientId;
@@ -72,8 +73,15 @@ namespace OpenRA.Network
void IConnection.Receive(OrderManager orderManager)
{
while (immediateOrders.TryDequeue(out var i))
{
orderManager.ReceiveImmediateOrders(LocalClientId, i);
// An immediate order may trigger a chain of actions that disposes the OrderManager and connection.
// Bail out to avoid potential problems from acting on disposed objects.
if (disposed)
break;
}
// Project orders forward to the next frame
while (orders.TryDequeue(out var o))
orderManager.ReceiveOrders(LocalClientId, (o.Frame + 1, o.Orders));
@@ -82,7 +90,10 @@ namespace OpenRA.Network
orderManager.ReceiveSync(s);
}
void IDisposable.Dispose() { }
void IDisposable.Dispose()
{
disposed = true;
}
}
public sealed class NetworkConnection : IConnection
@@ -272,6 +283,11 @@ namespace OpenRA.Network
{
orderManager.ReceiveImmediateOrders(clientId, i);
Recorder?.Receive(clientId, i.Serialize(0));
// An immediate order may trigger a chain of actions that disposes the OrderManager and connection.
// Bail out to avoid potential problems from acting on disposed objects.
if (disposed)
return;
}
while (sentSync.TryDequeue(out var s))
@@ -312,6 +328,11 @@ namespace OpenRA.Network
if (record)
Recorder?.Receive(p.FromClient, p.Data);
// An immediate order may trigger a chain of actions that disposes the OrderManager and connection.
// Bail out to avoid potential problems from acting on disposed objects.
if (disposed)
return;
}
}

16
OpenRA.Game/Network/OrderManager.cs
View File

@@ -128,19 +128,11 @@ namespace OpenRA.Network
public void ReceiveDisconnect(int clientIndex)
{
// HACK: The shellmap relies on ticking a disposed OM
if (disposed && World.Type != WorldType.Shellmap)
return;
pendingOrders.Remove(clientIndex);
}
public void ReceiveSync((int Frame, int SyncHash, ulong DefeatState) sync)
{
// HACK: The shellmap relies on ticking a disposed OM
if (disposed && World.Type != WorldType.Shellmap)
return;
if (syncForFrame.TryGetValue(sync.Frame, out var s))
{
if (s.SyncHash != sync.SyncHash || s.DefeatState != sync.DefeatState)
@@ -152,10 +144,6 @@ namespace OpenRA.Network
public void ReceiveImmediateOrders(int clientId, OrderPacket orders)
{
// HACK: The shellmap relies on ticking a disposed OM
if (disposed && World.Type != WorldType.Shellmap)
return;
foreach (var o in orders.GetOrders(World))
{
UnitOrders.ProcessOrder(this, World, clientId, o);
@@ -168,10 +156,6 @@ namespace OpenRA.Network
public void ReceiveOrders(int clientId, (int Frame, OrderPacket Orders) orders)
{
// HACK: The shellmap relies on ticking a disposed OM
if (disposed && World.Type != WorldType.Shellmap)
return;
if (pendingOrders.TryGetValue(clientId, out var queue))
queue.Enqueue((orders.Frame, orders.Orders));
else