ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 12:23:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: unsafe implementation of SeString.Parse()

Browse source
This commit is contained in:
goat 2021-08-28 18:41:59 +02:00
parent ef60d29ae0
commit e5cad2edde
No known key found for this signature in database
GPG key ID: F18F057873895461
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Dalamud/Game/Text/SeStringHandling/SeStringManager.cs
View file

@ -28,23 +28,17 @@ namespace Dalamud.Game.Text.SeStringHandling
/// <summary>
/// Parse a binary game message into an SeString.
/// </summary>
/// <param name="data">Binary message payload data in SE's internal format.</param>
/// <param name="ptr">Pointer to the string's data in memory.</param>
/// <param name="len">Length of the string's data in memory.</param>
/// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
public SeString Parse(ReadOnlySpan<byte> data) => this.Parse(data.ToArray());
/// <summary>
/// Parse a binary game message into an SeString.
/// </summary>
/// <param name="bytes">Binary message payload data in SE's internal format.</param>
/// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
public SeString Parse(byte[] bytes)
public unsafe SeString Parse(byte* ptr, int len)
{
var payloads = new List<Payload>();
using (var stream = new MemoryStream(bytes))
using (var stream = new UnmanagedMemoryStream(ptr, len))
using (var reader = new BinaryReader(stream))
{
while (stream.Position < bytes.Length)
while (stream.Position < len)
{
var payload = Payload.Decode(reader);
if (payload != null)
@ -55,6 +49,26 @@ namespace Dalamud.Game.Text.SeStringHandling
return new SeString(payloads);
}
/// <summary>
/// Parse a binary game message into an SeString.
/// </summary>
/// <param name="data">Binary message payload data in SE's internal format.</param>
/// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
public unsafe SeString Parse(ReadOnlySpan<byte> data)
{
fixed (byte* ptr = data)
{
return this.Parse(ptr, data.Length);
}
}
/// <summary>
/// Parse a binary game message into an SeString.
/// </summary>
/// <param name="bytes">Binary message payload data in SE's internal format.</param>
/// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
public SeString Parse(byte[] bytes) => this.Parse(new ReadOnlySpan<byte>(bytes));
/// <summary>
/// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
/// </summary>