Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix evil allocations, marshaling overhead #329

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix evil allocations, marshaling overhead #329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f62dfa8
Fix evil allocations, marshaling overhead
Kein Apr 13, 2021
a88cabd
Bring back null termination that slipped away
Kein Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions examples/button-clicker/Assets/DiscordRpc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ public class RichPresence
{
private RichPresenceStruct _presence;
private readonly List<IntPtr> _buffers = new List<IntPtr>(10);
private char[] _chrBuffer = new char[128];
private byte[] _byteBuffer = new byte[385]; // utf8 char max 4 bytes in worst case

public string state; /* max 128 bytes */
public string details; /* max 128 bytes */
Expand Down Expand Up @@ -189,14 +191,13 @@ internal RichPresenceStruct GetStruct()
private IntPtr StrToPtr(string input)
{
if (string.IsNullOrEmpty(input)) return IntPtr.Zero;
var convbytecnt = Encoding.UTF8.GetByteCount(input);
var buffer = Marshal.AllocHGlobal(convbytecnt + 1);
for (int i = 0; i < convbytecnt + 1; i++)
{
Marshal.WriteByte(buffer, i, 0);
}
var len = input.Length > 128 ? 128 : input.Length;
input.CopyTo(0, _chrBuffer, 0, len);
var convbytecnt = Encoding.UTF8.GetBytes(_chrBuffer, 0, len, _byteBuffer, 0);
IntPtr buffer = Marshal.AllocHGlobal(convbytecnt + 1);
Marshal.WriteByte(buffer, convbytecnt, 0);
_buffers.Add(buffer);
Marshal.Copy(Encoding.UTF8.GetBytes(input), 0, buffer, convbytecnt);
Marshal.Copy(_byteBuffer, 0, buffer, convbytecnt);
return buffer;
}

Expand Down Expand Up @@ -228,4 +229,4 @@ internal void FreeMem()
}
}
}
}
}