ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allocate 2 instead of 1 byte per char for buffer used in WinGLNative.HandleDropFiles

Browse source 
DragQueryFile returns number of characters. Previously, a buffer of 'number of characters' bytes was being allocated.

This change fixes crashing when the platform uses a character set with more than one byte per character. (unicode charset has 2 bytes)

Fixes #626
This commit is contained in:
UnknownShadow200 2017-08-05 23:56:42 +10:00 committed by GitHub
parent 254f7e9bfb
commit a3c0b05371
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -692,10 +692,11 @@ namespace OpenTK.Platform.Windows
for (uint i = 0; i < filesCounter; ++i)
{
// Don't forget about \0 at the end
uint fileNameSize = Functions.DragQueryFile(hDrop, i, IntPtr.Zero, 0) + 1;
IntPtr str = Marshal.AllocHGlobal((int)fileNameSize);
uint filenameChars = Functions.DragQueryFile(hDrop, i, IntPtr.Zero, 0) + 1;
int filenameSize = (int)(filenameChars * 2); // for unicode char set, 2 bytes per character
IntPtr str = Marshal.AllocHGlobal(filenameSize);
Functions.DragQueryFile(hDrop, i, str, fileNameSize);
Functions.DragQueryFile(hDrop, i, str, filenameChars);
string dropString = Marshal.PtrToStringAuto(str);
OnFileDrop(dropString);