From a3c0b0537132b961292813ae9c91e1b069f003c1 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 5 Aug 2017 23:56:42 +1000 Subject: [PATCH] Allocate 2 instead of 1 byte per char for buffer used in WinGLNative.HandleDropFiles 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 --- src/OpenTK/Platform/Windows/WinGLNative.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs index 460b24fe..5b31bac0 100644 --- a/src/OpenTK/Platform/Windows/WinGLNative.cs +++ b/src/OpenTK/Platform/Windows/WinGLNative.cs @@ -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);