From af380116a07a5169c8e0f72de06db92ac178a22b Mon Sep 17 00:00:00 2001
From: Mason Sciotti <mason.sciotti@gmail.com>
Date: Thu, 16 Aug 2018 11:23:28 -0700
Subject: [PATCH] Check C# strings against UTF8 bytes instead of clamping
 (#221)

---
 examples/button-clicker/Assets/DiscordRpc.cs | 58 ++++++--------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/examples/button-clicker/Assets/DiscordRpc.cs b/examples/button-clicker/Assets/DiscordRpc.cs
index dec1ade..af82c1c 100644
--- a/examples/button-clicker/Assets/DiscordRpc.cs
+++ b/examples/button-clicker/Assets/DiscordRpc.cs
@@ -129,20 +129,20 @@ public class DiscordRpc
                 FreeMem();
             }
 
-            _presence.state = StrToPtr(state, 128);
-            _presence.details = StrToPtr(details, 128);
+            _presence.state = StrToPtr(state);
+            _presence.details = StrToPtr(details);
             _presence.startTimestamp = startTimestamp;
             _presence.endTimestamp = endTimestamp;
-            _presence.largeImageKey = StrToPtr(largeImageKey, 32);
-            _presence.largeImageText = StrToPtr(largeImageText, 128);
-            _presence.smallImageKey = StrToPtr(smallImageKey, 32);
-            _presence.smallImageText = StrToPtr(smallImageText, 128);
-            _presence.partyId = StrToPtr(partyId, 128);
+            _presence.largeImageKey = StrToPtr(largeImageKey);
+            _presence.largeImageText = StrToPtr(largeImageText);
+            _presence.smallImageKey = StrToPtr(smallImageKey);
+            _presence.smallImageText = StrToPtr(smallImageText);
+            _presence.partyId = StrToPtr(partyId);
             _presence.partySize = partySize;
             _presence.partyMax = partyMax;
-            _presence.matchSecret = StrToPtr(matchSecret, 128);
-            _presence.joinSecret = StrToPtr(joinSecret, 128);
-            _presence.spectateSecret = StrToPtr(spectateSecret, 128);
+            _presence.matchSecret = StrToPtr(matchSecret);
+            _presence.joinSecret = StrToPtr(joinSecret);
+            _presence.spectateSecret = StrToPtr(spectateSecret);
             _presence.instance = instance;
 
             return _presence;
@@ -152,16 +152,18 @@ public class DiscordRpc
         /// Returns a pointer to a representation of the given string with a size of maxbytes
         /// </summary>
         /// <param name="input">String to convert</param>
-        /// <param name="maxbytes">Max number of bytes to use</param>
         /// <returns>Pointer to the UTF-8 representation of <see cref="input"/></returns>
-        private IntPtr StrToPtr(string input, int maxbytes)
+        private IntPtr StrToPtr(string input)
         {
             if (string.IsNullOrEmpty(input)) return IntPtr.Zero;
-            var convstr = StrClampBytes(input, maxbytes);
-            var convbytecnt = Encoding.UTF8.GetByteCount(convstr);
-            var buffer = Marshal.AllocHGlobal(convbytecnt);
+            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);
+            }
             _buffers.Add(buffer);
-            Marshal.Copy(Encoding.UTF8.GetBytes(convstr), 0, buffer, convbytecnt);
+            Marshal.Copy(Encoding.UTF8.GetBytes(input), 0, buffer, convbytecnt);
             return buffer;
         }
 
@@ -181,30 +183,6 @@ public class DiscordRpc
             return Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(str));
         }
 
-        /// <summary>
-        /// Clamp the string to the given byte length preserving null termination
-        /// </summary>
-        /// <param name="toclamp">string to clamp</param>
-        /// <param name="maxbytes">max bytes the resulting string should have (including null termination)</param>
-        /// <returns>null terminated string with a byte length less or equal to <see cref="maxbytes"/></returns>
-        private static string StrClampBytes(string toclamp, int maxbytes)
-        {
-            var str = StrToUtf8NullTerm(toclamp);
-            var strbytes = Encoding.UTF8.GetBytes(str);
-
-            if (strbytes.Length <= maxbytes)
-            {
-                return str;
-            }
-
-            var newstrbytes = new byte[] { };
-            Array.Copy(strbytes, 0, newstrbytes, 0, maxbytes - 1);
-            newstrbytes[newstrbytes.Length - 1] = 0;
-            newstrbytes[newstrbytes.Length - 2] = 0;
-
-            return Encoding.UTF8.GetString(newstrbytes);
-        }
-
         /// <summary>
         /// Free the allocated memory for conversion to <see cref="RichPresenceStruct"/>
         /// </summary>