Update NetMessage to pass in MemoryStream (#21796)

diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs
index 55a3a7342b7707ae01b1d14bc1fff6e4c846faeb..f7311d2dc8ceffbcaf92effe35862748ed1b345f 100644 (file)
--- a/Content.Shared/Chat/MsgChatMessage.cs
+++ b/Content.Shared/Chat/MsgChatMessage.cs
@@ -57,7 +57,8 @@ namespace Content.Shared.Chat
         public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
         {
             var length = buffer.ReadVariableInt32();
-            using var stream = buffer.ReadAlignedMemory(length);
+            using var stream = new MemoryStream(length);
+            buffer.ReadAlignedMemory(stream, length);
             serializer.DeserializeDirect(stream, out Message);
         }
 

diff --git a/Content.Shared/Eui/MsgEuiMessage.cs b/Content.Shared/Eui/MsgEuiMessage.cs
index c71efc2d7d08c2523a3593f78b74f13cf633ae31..3b6fbcad2c5c0db86a1aa4fc4f59bbfacb5c18bc 100644 (file)
--- a/Content.Shared/Eui/MsgEuiMessage.cs
+++ b/Content.Shared/Eui/MsgEuiMessage.cs
@@ -16,8 +16,9 @@ namespace Content.Shared.Eui
         {
             Id = buffer.ReadUInt32();
 
-            var len = buffer.ReadVariableInt32();
-            var stream = buffer.ReadAlignedMemory(len);
+            var length = buffer.ReadVariableInt32();
+            using var stream = new MemoryStream(length);
+            buffer.ReadAlignedMemory(stream, length);
             Message = ser.Deserialize<EuiMessageBase>(stream);
         }
 

diff --git a/Content.Shared/Eui/MsgEuiState.cs b/Content.Shared/Eui/MsgEuiState.cs
index d1867a3cdf0120bc264e632810c426cf353836ad..3ac80ad3eaa57b0ea29788f20d85b55a89831f9c 100644 (file)
--- a/Content.Shared/Eui/MsgEuiState.cs
+++ b/Content.Shared/Eui/MsgEuiState.cs
@@ -16,8 +16,9 @@ namespace Content.Shared.Eui
         {
             Id = buffer.ReadUInt32();
 
-            var len = buffer.ReadVariableInt32();
-            var stream = buffer.ReadAlignedMemory(len);
+            var length = buffer.ReadVariableInt32();
+            using var stream = new MemoryStream(length);
+            buffer.ReadAlignedMemory(stream, length);
             State = ser.Deserialize<EuiStateBase>(stream);
         }
 

diff --git a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
index d9179e634a17b471a1fe059376999d8c88ddaacc..c969c15f425587829a99d77bb7acafe5ee517295 100644 (file)
--- a/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
+++ b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
@@ -18,14 +18,17 @@ namespace Content.Shared.Preferences
         public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
         {
             var length = buffer.ReadVariableInt32();
-            using (var stream = buffer.ReadAlignedMemory(length))
+
+            using (var stream = new MemoryStream())
             {
+                buffer.ReadAlignedMemory(stream, length);
                 serializer.DeserializeDirect(stream, out Preferences);
             }
 
             length = buffer.ReadVariableInt32();
-            using (var stream = buffer.ReadAlignedMemory(length))
+            using (var stream = new MemoryStream())
             {
+                buffer.ReadAlignedMemory(stream, length);
                 serializer.DeserializeDirect(stream, out Settings);
             }
         }

diff --git a/Content.Shared/Preferences/MsgUpdateCharacter.cs b/Content.Shared/Preferences/MsgUpdateCharacter.cs
index 1cc662908d2e7ceb5bfa312b02499828d3475e3b..3c4af1833eda33dede05b18473d373e610e701e7 100644 (file)
--- a/Content.Shared/Preferences/MsgUpdateCharacter.cs
+++ b/Content.Shared/Preferences/MsgUpdateCharacter.cs
@@ -19,7 +19,8 @@ namespace Content.Shared.Preferences
         {
             Slot = buffer.ReadInt32();
             var length = buffer.ReadVariableInt32();
-            using var stream = buffer.ReadAlignedMemory(length);
+            using var stream = new MemoryStream(length);
+            buffer.ReadAlignedMemory(stream, length);
             Profile = serializer.Deserialize<ICharacterProfile>(stream);
         }