ryujinx/SDL2-CS
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL2-CS.git synced 2024-09-29 04:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some native memory leaks in the newer functions

Browse source
This commit is contained in:
Ethan Lee 2021-03-13 16:13:27 -05:00
parent 2b8d237fd4
commit 53026deb22
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/SDL2.cs
View file

@ -91,25 +91,6 @@ namespace SDL2
} }
return buffer; return buffer;
} }
internal static unsafe byte* Utf8EncodeNullable(string str)
{
if (str == null)
{
return (byte*) 0;
}
int bufferSize = Utf8Size(str);
byte* buffer = (byte*) Marshal.AllocHGlobal(bufferSize);
fixed (char* strPtr = str)
{
Encoding.UTF8.GetBytes(
strPtr,
(str != null) ? (str.Length + 1) : 0,
buffer,
bufferSize
);
}
return buffer;
}
/* This is public because SDL_DropEvent needs it! */ /* This is public because SDL_DropEvent needs it! */
public static unsafe string UTF8_ToManaged(IntPtr s, bool freePtr = false) public static unsafe string UTF8_ToManaged(IntPtr s, bool freePtr = false)
@ -7931,9 +7912,12 @@ namespace SDL2
public static unsafe SDL_bool SDL_AndroidRequestPermission( public static unsafe SDL_bool SDL_AndroidRequestPermission(
string permission string permission
) { ) {
return INTERNAL_SDL_AndroidRequestPermission( byte* permissionPtr = Utf8Encode(permission);
Utf8Encode(permission) SDL_bool result = INTERNAL_SDL_AndroidRequestPermission(
permissionPtr
); );
Marshal.FreeHGlobal((IntPtr) permissionPtr);
return result;
} }
/* WinRT */ /* WinRT */
@ -8251,9 +8235,10 @@ namespace SDL2
private static unsafe extern int INTERNAL_SDL_OpenURL(byte* url); private static unsafe extern int INTERNAL_SDL_OpenURL(byte* url);
public static unsafe int SDL_OpenURL(string url) public static unsafe int SDL_OpenURL(string url)
{ {
return INTERNAL_SDL_OpenURL( byte* urlPtr = Utf8Encode(url);
Utf8Encode(url) int result = INTERNAL_SDL_OpenURL(urlPtr);
); Marshal.FreeHGlobal((IntPtr) urlPtr);
return result;
} }
#endregion #endregion