Skip to content
/ libvlcsharp Public

Use Marshal.PtrToStringUTF8 for modern TFMs #420

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

Open
mfkl wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+6 −1
Open

Use Marshal.PtrToStringUTF8 for modern TFMs #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/LibVLCSharp/Shared/Helpers/MarshalExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ internal static IntPtr ToUtf8(this string? str)
if (nativeString == IntPtr.Zero)
return null;

#if NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
var result = Marshal.PtrToStringUTF8(nativeString);
#else
var length = 0;

while (Marshal.ReadByte(nativeString, length) != 0)
Expand All @@ -164,9 +167,11 @@ internal static IntPtr ToUtf8(this string? str)

var buffer = new byte[length];
Marshal.Copy(nativeString, buffer, 0, buffer.Length);
var result = Encoding.UTF8.GetString(buffer, 0, buffer.Length);
#endif
if (libvlcFree)
MarshalUtils.LibVLCFree(ref nativeString);
return Encoding.UTF8.GetString(buffer, 0, buffer.Length);
return result;
}

#if !APPLE && !ANDROID && !NETSTANDARD2_1 && !NET40
Expand Down