ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-03-28 06:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix X11 drag-n-drop returning wrong filename, and crashing

Browse source 
Wrong filename being returned was due to the filename being URL encoded.
Crashing was due to the offset being past the end of the buffer returned from Marshal.AllocHGlobal.

Fixes #570.
This commit is contained in:
UnknownShadow200 2017-07-12 17:15:33 +10:00 committed by GitHub
parent 1c5643f703
commit 65e59d9f42
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -338,8 +338,8 @@ namespace OpenTK.Platform.X11
string[] fileNames = new string[splitted.Length];
for (int i = 0; i < splitted.Length; i++)
{
// Delete start of name - file://
fileNames[i] = splitted[i].Substring(7);
// Delete starting file://, filename data is URI-encoded
fileNames[i] = Uri.UnescapeDataString(splitted[i].Substring(7));
}
return fileNames;
@ -866,9 +866,9 @@ namespace OpenTK.Platform.X11
else
{
formats = Marshal.AllocHGlobal(3 * IntPtr.Size);
Marshal.WriteIntPtr(formats, e.ClientMessageEvent.ptr3);
Marshal.WriteIntPtr(formats, IntPtr.Size * 2, e.ClientMessageEvent.ptr4);
Marshal.WriteIntPtr(formats, IntPtr.Size * 3, e.ClientMessageEvent.ptr5);
Marshal.WriteIntPtr(formats, IntPtr.Size * 0, e.ClientMessageEvent.ptr3);
Marshal.WriteIntPtr(formats, IntPtr.Size * 1, e.ClientMessageEvent.ptr4);
Marshal.WriteIntPtr(formats, IntPtr.Size * 2, e.ClientMessageEvent.ptr5);
formatCount = 3;
}