Merge pull request #551 from mbbsemu/textvar-race

Fix a Race Condition if a disconnect were to happen during processing…
mbbsemu · Mar 14, 2022 · 227d3be · 227d3be
2 parents a983417 + bb56c67
commit 227d3be
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/MBBSEmu/HostProcess/ExportedModules/ExportedModuleBase.cs b/MBBSEmu/HostProcess/ExportedModules/ExportedModuleBase.cs
@@ -681,7 +681,11 @@ private protected ReadOnlySpan<byte> ProcessTextVariables(ReadOnlySpan<byte> out
 
             var txtvarsFound = _textVariableService.ExtractVariableDefinitions(outputBuffer);
 
-            var txtvarDictionary = ChannelDictionary[ChannelNumber].SessionVariables;
+            //This can happen if a channel disconnects during the processing of the main loop
+            if (!ChannelDictionary.TryGetValue(ChannelNumber, out var channelSession))
+                return outputBuffer;
+
+            var txtvarDictionary = channelSession.SessionVariables;
 
             //Get Their Values
             var txtvarMemoryBase = Module.Memory.GetVariablePointer("TXTVARS");