tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update NetMessage to pass in MemoryStream (#21796)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-28 19:11:16 +11:00
committed by GitHub
parent eeebb3ffd3
commit d783b32d92
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Chat/MsgChatMessage.cs
View File

@@ -57,7 +57,8 @@ namespace Content.Shared.Chat
public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
{ {
var length = buffer.ReadVariableInt32(); 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); serializer.DeserializeDirect(stream, out Message);
} }

5
Content.Shared/Eui/MsgEuiMessage.cs
View File

@@ -16,8 +16,9 @@ namespace Content.Shared.Eui
{ {
Id = buffer.ReadUInt32(); Id = buffer.ReadUInt32();
var len = buffer.ReadVariableInt32(); var length = buffer.ReadVariableInt32();
var stream = buffer.ReadAlignedMemory(len); using var stream = new MemoryStream(length);
buffer.ReadAlignedMemory(stream, length);
Message = ser.Deserialize<EuiMessageBase>(stream); Message = ser.Deserialize<EuiMessageBase>(stream);
} }

5
Content.Shared/Eui/MsgEuiState.cs
View File

@@ -16,8 +16,9 @@ namespace Content.Shared.Eui
{ {
Id = buffer.ReadUInt32(); Id = buffer.ReadUInt32();
var len = buffer.ReadVariableInt32(); var length = buffer.ReadVariableInt32();
var stream = buffer.ReadAlignedMemory(len); using var stream = new MemoryStream(length);
buffer.ReadAlignedMemory(stream, length);
State = ser.Deserialize<EuiStateBase>(stream); State = ser.Deserialize<EuiStateBase>(stream);
} }

7
Content.Shared/Preferences/MsgPreferencesAndSettings.cs
View File

@@ -18,14 +18,17 @@ namespace Content.Shared.Preferences
public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
{ {
var length = buffer.ReadVariableInt32(); var length = buffer.ReadVariableInt32();
using (var stream = buffer.ReadAlignedMemory(length))
using (var stream = new MemoryStream())
{ {
buffer.ReadAlignedMemory(stream, length);
serializer.DeserializeDirect(stream, out Preferences); serializer.DeserializeDirect(stream, out Preferences);
} }
length = buffer.ReadVariableInt32(); length = buffer.ReadVariableInt32();
using (var stream = buffer.ReadAlignedMemory(length)) using (var stream = new MemoryStream())
{ {
buffer.ReadAlignedMemory(stream, length);
serializer.DeserializeDirect(stream, out Settings); serializer.DeserializeDirect(stream, out Settings);
} }
} }

3
Content.Shared/Preferences/MsgUpdateCharacter.cs
View File

@@ -19,7 +19,8 @@ namespace Content.Shared.Preferences
{ {
Slot = buffer.ReadInt32(); Slot = buffer.ReadInt32();
var length = buffer.ReadVariableInt32(); 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); Profile = serializer.Deserialize<ICharacterProfile>(stream);
} }