Skip to content

fix: wrap CommandV allocations in try/finally to prevent memory leaks #785

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
Noethix55555 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: wrap CommandV allocations in try/finally to prevent memory leaks #785

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
34 changes: 20 additions & 14 deletions src/MpvNet/MpvClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,24 +227,30 @@ public void CommandV(params string[] args)
IntPtr[] pointers = new IntPtr[count];
IntPtr rootPtr = Marshal.AllocHGlobal(IntPtr.Size * count);

for (int index = 0; index < args.Length; index++)
try
{
var bytes = GetUtf8Bytes(args[index]);
IntPtr ptr = Marshal.AllocHGlobal(bytes.Length);
Marshal.Copy(bytes, 0, ptr, bytes.Length);
pointers[index] = ptr;
}

Marshal.Copy(pointers, 0, rootPtr, count);
mpv_error err = mpv_command(Handle, rootPtr);
for (int index = 0; index < args.Length; index++)
{
var bytes = GetUtf8Bytes(args[index]);
IntPtr ptr = Marshal.AllocHGlobal(bytes.Length);
Marshal.Copy(bytes, 0, ptr, bytes.Length);
pointers[index] = ptr;
}

foreach (IntPtr ptr in pointers)
Marshal.FreeHGlobal(ptr);
Marshal.Copy(pointers, 0, rootPtr, count);
mpv_error err = mpv_command(Handle, rootPtr);

Marshal.FreeHGlobal(rootPtr);
if (err < 0)
HandleError(err, "error executing command: " + string.Join("\n", args));
}
finally
{
foreach (IntPtr ptr in pointers)
if (ptr != IntPtr.Zero)
Marshal.FreeHGlobal(ptr);

if (err < 0)
HandleError(err, "error executing command: " + string.Join("\n", args));
Marshal.FreeHGlobal(rootPtr);
}
}

public string Expand(string? value)
Expand Down