Revert Utf8StringMarshaller.cs changes and replace remaining Marshal.PtrToStringUTF8 calls

Copilot · jkotas · Copilot · commit c149786af5d0 · 2025-08-18T23:39:26.000Z
Co-authored-by: jkotas &lt;6668460+jkotas@users.noreply.github.com&gt;
diff --git a/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
@@ -12,6 +12,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Runtime.Versioning;
 using System.Threading;
 
@@ -886,7 +887,7 @@ private static unsafe void ConfigCallback(void* configurationContext, void* name
             Debug.Assert(context.Configurations != null);
             Dictionary<string, object> configurationDictionary = context.Configurations!;
 
-            string nameAsString = Marshal.PtrToStringUTF8((IntPtr)name)!;
+            string nameAsString = Utf8StringMarshaller.ConvertToManaged((IntPtr)name)!;
             switch (type)
             {
                 case GCConfigurationType.Int64:
@@ -895,7 +896,7 @@ private static unsafe void ConfigCallback(void* configurationContext, void* name
 
                 case GCConfigurationType.StringUtf8:
                     {
-                        string? dataAsString = Marshal.PtrToStringUTF8((nint)data);
+                        string? dataAsString = Utf8StringMarshaller.ConvertToManaged((IntPtr)data);
                         configurationDictionary[nameAsString] = dataAsString ?? string.Empty;
                         break;
                     }
diff --git a/src/libraries/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Err.cs b/src/libraries/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Err.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Security.Cryptography;
 
 internal static partial class Interop
@@ -34,7 +35,7 @@ private static unsafe string ErrErrorStringN(ulong error)
             fixed (byte* buf = &buffer[0])
             {
                 ErrErrorStringN(error, buf, buffer.Length);
-                return Marshal.PtrToStringUTF8((IntPtr)buf)!;
+                return Utf8StringMarshaller.ConvertToManaged((IntPtr)buf)!;
             }
         }
 
diff --git a/src/libraries/Common/src/Interop/FreeBSD/Interop.Process.cs b/src/libraries/Common/src/Interop/FreeBSD/Interop.Process.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 #pragma warning disable CA1823 // analyzer incorrectly flags fixed buffer length const (https://github.com/dotnet/roslyn/issues/37593)
 
@@ -117,7 +118,7 @@ public static unsafe ProcessInfo GetProcessInfoById(int pid)
                 // Get the process information for the specified pid
                 info = new ProcessInfo();
 
-                info.ProcessName = Marshal.PtrToStringUTF8((IntPtr)kinfo->ki_comm)!;
+                info.ProcessName = Utf8StringMarshaller.ConvertToManaged((IntPtr)kinfo->ki_comm)!;
                 info.BasePriority = kinfo->ki_nice;
                 info.VirtualBytes = (long)kinfo->ki_size;
                 info.WorkingSet = kinfo->ki_rssize;
diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 using Microsoft.Win32.SafeHandles;
 
@@ -42,7 +43,7 @@ internal static string CFStringToString(SafeCFStringHandle cfString)
 
             if (interiorPointer != IntPtr.Zero)
             {
-                return Marshal.PtrToStringUTF8(interiorPointer)!;
+                return Utf8StringMarshaller.ConvertToManaged(interiorPointer)!;
             }
 
             SafeCFDataHandle cfData = CFStringCreateExternalRepresentation(
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 internal static partial class Interop
 {
@@ -59,7 +60,7 @@ internal static unsafe Error GetFileSystemTypeNameForMountPoint(string name, out
             int result = GetFileSystemTypeNameForMountPoint(name, formatBuffer, MountPointFormatBufferSizeInBytes, &formatType);
             if (result == 0)
             {
-                format = formatType == -1 ? Marshal.PtrToStringUTF8((IntPtr)formatBuffer)!
+                format = formatType == -1 ? Utf8StringMarshaller.ConvertToManaged((IntPtr)formatBuffer)!
                                           : (Enum.GetName(typeof(UnixFileSystemTypes), formatType) ?? "");
                 return Error.SUCCESS;
             }
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MountPoints.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 internal static partial class Interop
 {
@@ -27,7 +28,7 @@ private static unsafe void AddMountPoint(void* context, byte* name)
             AllMountPointsContext* callbackContext = (AllMountPointsContext*)context;
             try
             {
-                callbackContext->_results.Add(Marshal.PtrToStringUTF8((IntPtr)name)!);
+                callbackContext->_results.Add(Utf8StringMarshaller.ConvertToManaged((IntPtr)name)!);
             }
             catch (Exception e)
             {
diff --git a/src/libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs b/src/libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 internal static partial class Interop
 {
@@ -85,7 +86,7 @@ private static string GetGssApiDisplayStatus(Status majorStatus, Status minorSta
                     Interop.NetSecurityNative.Status displayCallStatus = isMinor ?
                         DisplayMinorStatus(out minStat, status, ref displayBuffer) :
                         DisplayMajorStatus(out minStat, status, ref displayBuffer);
-                    return (Status.GSS_S_COMPLETE != displayCallStatus) ? null : Marshal.PtrToStringUTF8(displayBuffer._data);
+                    return (Status.GSS_S_COMPLETE != displayCallStatus) ? null : Utf8StringMarshaller.ConvertToManaged(displayBuffer._data);
                 }
                 finally
                 {
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
@@ -330,7 +330,7 @@ internal static bool AddExtraChainCertificates(SafeSslHandle ssl, ReadOnlyCollec
 
         internal static string? GetOpenSslCipherSuiteName(SafeSslHandle ssl, TlsCipherSuite cipherSuite, out bool isTls12OrLower)
         {
-            string? ret = Marshal.PtrToStringUTF8(GetOpenSslCipherSuiteName(ssl, (int)cipherSuite, out int isTls12OrLowerInt));
+            string? ret = Utf8StringMarshaller.ConvertToManaged(GetOpenSslCipherSuiteName(ssl, (int)cipherSuite, out int isTls12OrLowerInt));
             isTls12OrLower = isTls12OrLowerInt != 0;
             return ret;
         }
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtx.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtx.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Net.Security;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
@@ -219,7 +220,7 @@ internal void RemoveSession(IntPtr namePtr, IntPtr session)
         {
             Debug.Assert(_sslSessions != null);
 
-            string? targetName = Marshal.PtrToStringUTF8(namePtr);
+            string? targetName = Utf8StringMarshaller.ConvertToManaged(namePtr);
             Debug.Assert(targetName != null);
 
             if (_sslSessions != null && targetName != null)
diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.Win32.SafeHandles;
@@ -252,7 +253,7 @@ internal static unsafe void X509StoreCtxSetVerifyCallback(SafeX509StoreCtxHandle
 
         internal static string GetX509VerifyCertErrorString(int n)
         {
-            return Marshal.PtrToStringUTF8(CryptoNative_X509VerifyCertErrorString(n))!;
+            return Utf8StringMarshaller.ConvertToManaged(CryptoNative_X509VerifyCertErrorString(n))!;
         }
 
         [LibraryImport(Libraries.CryptoNative)]
diff --git a/src/libraries/Common/src/System/IO/Compression/ZLibNative.cs b/src/libraries/Common/src/System/IO/Compression/ZLibNative.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Security;
 
 namespace System.IO.Compression
@@ -317,7 +318,7 @@ public unsafe ErrorCode InflateEnd()
             }
 
             // This can work even after XxflateEnd().
-            public string GetErrorMessage() => _zStream.msg != ZNullPtr ? Marshal.PtrToStringUTF8(_zStream.msg)! : string.Empty;
+            public string GetErrorMessage() => _zStream.msg != ZNullPtr ? Utf8StringMarshaller.ConvertToManaged(_zStream.msg)! : string.Empty;
         }
 
         public static ErrorCode CreateZLibStreamForDeflate(out ZLibStreamHandle zLibStreamHandle, CompressionLevel level,
diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs b/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -57,7 +58,7 @@ private static unsafe void ParseHostEntry(Interop.Sys.HostEntry hostEntry, bool
             try
             {
                 hostName = !justAddresses && hostEntry.CanonicalName != null
-                    ? Marshal.PtrToStringUTF8((IntPtr)hostEntry.CanonicalName)
+                    ? Utf8StringMarshaller.ConvertToManaged((IntPtr)hostEntry.CanonicalName)
                     : null;
 
                 IPAddress[] localAddresses;
@@ -113,7 +114,7 @@ private static unsafe void ParseHostEntry(Interop.Sys.HostEntry hostEntry, bool
                         localAliases = new string[numAliases];
                         for (int i = 0; i < localAliases.Length; i++)
                         {
-                            localAliases[i] = Marshal.PtrToStringUTF8((IntPtr)hostEntry.Aliases[i])!;
+                            localAliases[i] = Utf8StringMarshaller.ConvertToManaged((IntPtr)hostEntry.Aliases[i])!;
                         }
                     }
                 }
@@ -186,7 +187,7 @@ public static unsafe SocketError TryGetAddrInfo(string name, bool justAddresses,
 
             socketError = GetSocketErrorForNativeError(error);
             nativeErrorCode = error;
-            return socketError == SocketError.Success ? Marshal.PtrToStringUTF8((IntPtr)buffer) : null;
+            return socketError == SocketError.Success ? Utf8StringMarshaller.ConvertToManaged((IntPtr)buffer) : null;
         }
 
         public static string GetHostName() => Interop.Sys.GetHostName();
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/LinuxNetworkInterface.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/LinuxNetworkInterface.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 
 namespace System.Net.NetworkInformation
@@ -94,7 +95,7 @@ public static unsafe NetworkInterface[] GetLinuxNetworkInterfaces()
 
                 for (int i = 0; i < interfaceCount; i++)
                 {
-                    var lni = new LinuxNetworkInterface(Marshal.PtrToStringUTF8((IntPtr)nii->Name)!, nii->InterfaceIndex, systemProperties);
+                    var lni = new LinuxNetworkInterface(Utf8StringMarshaller.ConvertToManaged((IntPtr)nii->Name)!, nii->InterfaceIndex, systemProperties);
                     lni._interfaceType = (NetworkInterfaceType)nii->HardwareType;
                     lni._speed = nii->Speed;
                     lni._operationalStatus = (OperationalStatus)nii->OperationalState;
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterfacePal.Android.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetworkInterfacePal.Android.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 namespace System.Net.NetworkInformation
 {
@@ -51,7 +52,7 @@ private static unsafe AndroidNetworkInterface[] ToAndroidNetworkInterfaceArray(i
             var networkInterfaceInfo = (Interop.Sys.NetworkInterfaceInfo*)networkInterfacesPtr;
             for (int i = 0; i < interfaceCount; i++, networkInterfaceInfo++)
             {
-                var name = Marshal.PtrToStringUTF8((IntPtr)networkInterfaceInfo->Name);
+                var name = Utf8StringMarshaller.ConvertToManaged((IntPtr)networkInterfaceInfo->Name);
                 networkInterfaces[i] = new AndroidNetworkInterface(name!, networkInterfaceInfo);
             }
 
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs
@@ -6,6 +6,7 @@
 using System.Net.Sockets;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using Microsoft.Quic;
 using static Microsoft.Quic.MsQuic;
 
@@ -170,7 +171,7 @@ static MsQuicApi()
                 }
                 return;
             }
-            string? gitHash = Marshal.PtrToStringUTF8((IntPtr)libGitHash);
+            string? gitHash = Utf8StringMarshaller.ConvertToManaged((IntPtr)libGitHash);
 
             MsQuicLibraryVersion = $"{Interop.Libraries.MsQuic} {Version} ({gitHash})";
 
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicListener.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicListener.cs
@@ -6,6 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Runtime.Versioning;
 using System.Security.Authentication;
 using System.Threading;
@@ -341,7 +342,7 @@ private unsafe int HandleEventNewConnection(ref NEW_CONNECTION_DATA data)
             NetEventSource.Info(this, $"{this} New inbound connection {connection}.");
         }
 
-        SslClientHelloInfo clientHello = new SslClientHelloInfo(data.Info->ServerNameLength > 0 ? Marshal.PtrToStringUTF8((IntPtr)data.Info->ServerName, data.Info->ServerNameLength) : "", SslProtocols.Tls13);
+        SslClientHelloInfo clientHello = new SslClientHelloInfo(data.Info->ServerNameLength > 0 ? Utf8StringMarshaller.ConvertToManaged((IntPtr)data.Info->ServerName, data.Info->ServerNameLength) : "", SslProtocols.Tls13);
 
         // Kicks off the rest of the handshake in the background, the process itself will enqueue the result in the accept queue.
         StartConnectionHandshake(connection, clientHello);
diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/Utf8StringMarshaller.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/Utf8StringMarshaller.cs
@@ -33,83 +33,38 @@ public static unsafe class Utf8StringMarshaller
             return mem;
         }
 
-        /// <summary>
-        /// Converts a string to an unmanaged version.
-        /// </summary>
-        /// <param name="managed">The managed string to convert.</param>
-        /// <returns>An unmanaged string pointer.</returns>
-        public static unsafe IntPtr ConvertToUnmanagedIntPtr(string? managed)
-        {
-            return (IntPtr)ConvertToUnmanaged(managed);
-        }
-
         /// <summary>
         /// Converts an unmanaged string to a managed version.
         /// </summary>
         /// <param name="unmanaged">The unmanaged string to convert.</param>
         /// <returns>A managed string.</returns>
-        public static unsafe string? ConvertToManaged(byte* unmanaged)
-        {
-            if (unmanaged is null)
-                return null;
-
-            int nbBytes = string.strlen(unmanaged);
-            return string.CreateStringFromEncoding(unmanaged, nbBytes, Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Converts an unmanaged string to a managed version.
-        /// </summary>
-        /// <param name="unmanaged">The unmanaged string to convert.</param>
-        /// <param name="byteLen">The length of the unmanaged string in bytes.</param>
-        /// <returns>A managed string.</returns>
-        public static unsafe string ConvertToManaged(byte* unmanaged, int byteLen)
-        {
-            ArgumentNullException.ThrowIfNull(unmanaged);
-            ArgumentOutOfRangeException.ThrowIfNegative(byteLen);
-
-            return string.CreateStringFromEncoding(unmanaged, byteLen, Encoding.UTF8);
-        }
+        public static string? ConvertToManaged(byte* unmanaged)
+            => Marshal.PtrToStringUTF8((IntPtr)unmanaged);
 
         /// <summary>
         /// Converts an unmanaged string to a managed version.
         /// </summary>
         /// <param name="unmanaged">The unmanaged string pointer to convert.</param>
         /// <returns>A managed string.</returns>
-        public static unsafe string? ConvertToManaged(IntPtr unmanaged)
-        {
-            if (IsNullOrWin32Atom(unmanaged))
-                return null;
-
-            return ConvertToManaged((byte*)unmanaged);
-        }
+        public static string? ConvertToManaged(IntPtr unmanaged)
+            => Marshal.PtrToStringUTF8(unmanaged);
 
         /// <summary>
         /// Converts an unmanaged string to a managed version.
         /// </summary>
         /// <param name="unmanaged">The unmanaged string pointer to convert.</param>
         /// <param name="byteLen">The length of the unmanaged string in bytes.</param>
         /// <returns>A managed string.</returns>
-        public static unsafe string ConvertToManaged(IntPtr unmanaged, int byteLen)
-        {
-            return ConvertToManaged((byte*)unmanaged, byteLen);
-        }
-
-#if TARGET_WINDOWS
-        // Win32 has the concept of Atoms, where a pointer can either be a pointer
-        // or an int.  If it's less than 64K, this is guaranteed to NOT be a
-        // pointer since the bottom 64K bytes are reserved in a process' page table.
-        // We should be careful about deallocating this stuff.
-        private static bool IsNullOrWin32Atom(IntPtr ptr)
-        {
-            const long HIWORDMASK = unchecked((long)0xffffffffffff0000L);
+        public static string? ConvertToManaged(IntPtr unmanaged, int byteLen)
+            => Marshal.PtrToStringUTF8(unmanaged, byteLen);
 
-            long lPtr = (long)ptr;
-            return 0 == (lPtr & HIWORDMASK);
-        }
-#else
-        private static bool IsNullOrWin32Atom(IntPtr ptr) => ptr == IntPtr.Zero;
-#endif
+        /// <summary>
+        /// Converts a string to an unmanaged version and returns it as an IntPtr.
+        /// </summary>
+        /// <param name="managed">The managed string to convert.</param>
+        /// <returns>An unmanaged string pointer.</returns>
+        public static IntPtr ConvertToUnmanagedIntPtr(string? managed)
+            => Marshal.StringToCoTaskMemUTF8(managed);
 
         /// <summary>
         /// Free the memory for a specified unmanaged string.
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/OidLookup.OpenSsl.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/OidLookup.OpenSsl.cs

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Diagnostics;`
`6`	`6`	`using System.Runtime.InteropServices;`
	`7`	`+using System.Runtime.InteropServices.Marshalling;`
`7`	`8`	`using System.Security.Cryptography;`
`8`	`9`
`9`	`10`	`internal static partial class Interop`
`@@ -34,7 +35,7 @@ private static unsafe string ErrErrorStringN(ulong error)`
`34`	`35`	`fixed (byte* buf = &buffer[0])`
`35`	`36`	`{`
`36`	`37`	`ErrErrorStringN(error, buf, buffer.Length);`
`37`		`- return Marshal.PtrToStringUTF8((IntPtr)buf)!;`
	`38`	`+ return Utf8StringMarshaller.ConvertToManaged((IntPtr)buf)!;`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Runtime.InteropServices;`
	`7`	`+using System.Runtime.InteropServices.Marshalling;`
`7`	`8`
`8`	`9`	`internal static partial class Interop`
`9`	`10`	`{`
`@@ -59,7 +60,7 @@ internal static unsafe Error GetFileSystemTypeNameForMountPoint(string name, out`
`59`	`60`	`int result = GetFileSystemTypeNameForMountPoint(name, formatBuffer, MountPointFormatBufferSizeInBytes, &formatType);`
`60`	`61`	`if (result == 0)`
`61`	`62`	`{`
`62`		`- format = formatType == -1 ? Marshal.PtrToStringUTF8((IntPtr)formatBuffer)!`
	`63`	`+ format = formatType == -1 ? Utf8StringMarshaller.ConvertToManaged((IntPtr)formatBuffer)!`
`63`	`64`	`: (Enum.GetName(typeof(UnixFileSystemTypes), formatType) ?? "");`
`64`	`65`	`return Error.SUCCESS;`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Runtime.CompilerServices;`
`8`	`8`	`using System.Runtime.ExceptionServices;`
`9`	`9`	`using System.Runtime.InteropServices;`
	`10`	`+using System.Runtime.InteropServices.Marshalling;`
`10`	`11`
`11`	`12`	`internal static partial class Interop`
`12`	`13`	`{`
`@@ -27,7 +28,7 @@ private static unsafe void AddMountPoint(void* context, byte* name)`
`27`	`28`	`AllMountPointsContext* callbackContext = (AllMountPointsContext*)context;`
`28`	`29`	`try`
`29`	`30`	`{`
`30`		`- callbackContext->_results.Add(Marshal.PtrToStringUTF8((IntPtr)name)!);`
	`31`	`+ callbackContext->_results.Add(Utf8StringMarshaller.ConvertToManaged((IntPtr)name)!);`
`31`	`32`	`}`
`32`	`33`	`catch (Exception e)`
`33`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Diagnostics;`
`7`	`7`	`using System.Runtime.InteropServices;`
	`8`	`+using System.Runtime.InteropServices.Marshalling;`
`8`	`9`
`9`	`10`	`internal static partial class Interop`
`10`	`11`	`{`
`@@ -85,7 +86,7 @@ private static string GetGssApiDisplayStatus(Status majorStatus, Status minorSta`
`85`	`86`	`Interop.NetSecurityNative.Status displayCallStatus = isMinor ?`
`86`	`87`	`DisplayMinorStatus(out minStat, status, ref displayBuffer) :`
`87`	`88`	`DisplayMajorStatus(out minStat, status, ref displayBuffer);`
`88`		`- return (Status.GSS_S_COMPLETE != displayCallStatus) ? null : Marshal.PtrToStringUTF8(displayBuffer._data);`
	`89`	`+ return (Status.GSS_S_COMPLETE != displayCallStatus) ? null : Utf8StringMarshaller.ConvertToManaged(displayBuffer._data);`
`89`	`90`	`}`
`90`	`91`	`finally`
`91`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ internal static bool AddExtraChainCertificates(SafeSslHandle ssl, ReadOnlyCollec`
`330`	`330`
`331`	`331`	`internal static string? GetOpenSslCipherSuiteName(SafeSslHandle ssl, TlsCipherSuite cipherSuite, out bool isTls12OrLower)`
`332`	`332`	`{`
`333`		`- string? ret = Marshal.PtrToStringUTF8(GetOpenSslCipherSuiteName(ssl, (int)cipherSuite, out int isTls12OrLowerInt));`
	`333`	`+ string? ret = Utf8StringMarshaller.ConvertToManaged(GetOpenSslCipherSuiteName(ssl, (int)cipherSuite, out int isTls12OrLowerInt));`
`334`	`334`	`isTls12OrLower = isTls12OrLowerInt != 0;`
`335`	`335`	`return ret;`
`336`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Diagnostics.CodeAnalysis;`
`6`	`6`	`using System.Runtime.InteropServices;`
	`7`	`+using System.Runtime.InteropServices.Marshalling;`
`7`	`8`	`using System.Security.Cryptography;`
`8`	`9`	`using System.Security.Cryptography.X509Certificates;`
`9`	`10`	`using Microsoft.Win32.SafeHandles;`
`@@ -252,7 +253,7 @@ internal static unsafe void X509StoreCtxSetVerifyCallback(SafeX509StoreCtxHandle`
`252`	`253`
`253`	`254`	`internal static string GetX509VerifyCertErrorString(int n)`
`254`	`255`	`{`
`255`		`- return Marshal.PtrToStringUTF8(CryptoNative_X509VerifyCertErrorString(n))!;`
	`256`	`+ return Utf8StringMarshaller.ConvertToManaged(CryptoNative_X509VerifyCertErrorString(n))!;`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`[LibraryImport(Libraries.CryptoNative)]`