Fix up string marshaller

robotdotnet · Jan 28, 2024 · a458466 · a458466
1 parent 6e3f017
commit a458466
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/ntcore/Natives/RefNetworkTableValueMarshaller.cs b/src/ntcore/Natives/RefNetworkTableValueMarshaller.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
@@ -79,9 +80,15 @@ public void FromManaged(in RefNetworkTableValue managed, Span<byte> callerAlloca
                 m_doAssignment = true;
                 break;
             case NetworkTableType.String:
-                byte[] stringArrayData = Encoding.UTF8.GetBytes(managed.m_stringValue!);
-                m_toPin = MemoryMarshal.AsBytes(stringArrayData.AsSpan()).GetPinnableReference();
-                m_nativeValue.data.valueString = new(null, (nuint)stringArrayData.Length);
+                int byteCount = Encoding.UTF8.GetByteCount(managed.m_stringValue!);
+                Span<byte> stringSpan = callerAllocatedBuffer;
+                if (byteCount > stringSpan.Length) {
+                    stringSpan = new byte[byteCount];
+                }
+                int exactBytes = Encoding.UTF8.GetBytes(managed.m_stringValue!, stringSpan);
+                Debug.Assert(exactBytes == byteCount);
+                m_toPin = stringSpan.GetPinnableReference();
+                m_nativeValue.data.valueString = new(null, (nuint)stringSpan.Length);
                 m_toAssignPin = m_nativeValue.data.valueString.Str;
                 m_doAssignment = true;
                 break;
@@ -92,7 +99,8 @@ public void FromManaged(in RefNetworkTableValue managed, Span<byte> callerAlloca
                 {
                     int len = Encoding.UTF8.GetByteCount(managed.m_stringSpan[i]);
                     byte* mem = (byte*)NativeMemory.Alloc((nuint)len);
-                    Encoding.UTF8.GetBytes(managed.m_stringSpan[i], new Span<byte>(mem, len));
+                    int exactLen = Encoding.UTF8.GetBytes(managed.m_stringSpan[i], new Span<byte>(mem, len));
+                    Debug.Assert(exactLen == len);
                     strings[i] = new WpiStringMarshaller.WpiStringNative(mem, (nuint)len);
                 }