From: AeonLucid <aeonlucid@outlook.com>
Date: Mon, 2 Nov 2020 00:26:37 +0000 (+0100)
Subject: Dispose message readers
X-Git-Tag: v1.2.2~46
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=6bd718607422db6b9798d515aa13efc9b9612941;p=rhonda%2Fimpostor.git

Dispose message readers
---

diff --git a/src/Impostor.Server/Net/Hazel/HazelConnection.cs b/src/Impostor.Server/Net/Hazel/HazelConnection.cs
index 1d6f35c..45d2be8 100644
--- a/src/Impostor.Server/Net/Hazel/HazelConnection.cs
+++ b/src/Impostor.Server/Net/Hazel/HazelConnection.cs
@@ -64,7 +64,10 @@ namespace Impostor.Server.Net.Hazel
                     break;
                 }
 
-                await Client.HandleMessageAsync(e.Message.ReadMessage(), e.Type);
+                using (var message = e.Message.ReadMessage())
+                {
+                    await Client.HandleMessageAsync(message, e.Type);
+                }
             }
         }
     }
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
index 7f71b1f..d4881ab 100644
--- a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
@@ -81,7 +81,7 @@ namespace Impostor.Server.Net.Inner.Objects
 
                     while (reader.Position < reader.Length)
                     {
-                        var message = reader.ReadMessage();
+                        using var message = reader.ReadMessage();
                         var player = GetPlayerById(message.Tag);
                         if (player != null)
                         {
@@ -182,4 +182,4 @@ namespace Impostor.Server.Net.Inner.Objects
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs
index f422808..a84d9b5 100644
--- a/src/Impostor.Server/Net/State/Game.Data.cs
+++ b/src/Impostor.Server/Net/State/Game.Data.cs
@@ -222,7 +222,7 @@ namespace Impostor.Server.Net.State
             // Parse GameData messages.
             while (parent.Position < parent.Length)
             {
-                var reader = parent.ReadMessage();
+                using var reader = parent.ReadMessage();
 
                 switch (reader.Tag)
                 {
@@ -319,7 +319,7 @@ namespace Impostor.Server.Net.State
                                     break;
                                 }
 
-                                var readerSub = reader.ReadMessage();
+                                using var readerSub = reader.ReadMessage();
                                 if (readerSub.Length > 0)
                                 {
                                     obj.Deserialize(sender, target, readerSub, true);
diff --git a/src/Impostor.Tools.Proxy/Program.cs b/src/Impostor.Tools.Proxy/Program.cs
index b97dd94..468cdd1 100644
--- a/src/Impostor.Tools.Proxy/Program.cs
+++ b/src/Impostor.Tools.Proxy/Program.cs
@@ -111,7 +111,7 @@ namespace Impostor.Tools.Proxy
                         break;
                     }
 
-                    var message = reader.ReadMessage();
+                    using var message = reader.ReadMessage();
                     if (isSent)
                     {
                         HandleToServer(ipSrc, message);