From 7fb841c839bc72c2cb5b2c75358ecb9149ce714c Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 19 Feb 2017 13:22:02 +0000 Subject: [PATCH] [SHELL32] For the input string, WideCharToMultiByte takes a char count and not a buffer size. CID 1401096, 1401088 svn path=/trunk/; revision=73845 --- reactos/dll/win32/shell32/CShellLink.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/CShellLink.cpp b/reactos/dll/win32/shell32/CShellLink.cpp index f10cf927ebf..e0051f6a609 100644 --- a/reactos/dll/win32/shell32/CShellLink.cpp +++ b/reactos/dll/win32/shell32/CShellLink.cpp @@ -1074,13 +1074,17 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN /* Copy the file data if a file path was returned */ if (*pszFile) { + DWORD len; + /* Copy the fixed part */ CopyMemory(pfd, &wfd, FIELD_OFFSET(WIN32_FIND_DATAA, cFileName)); /* Convert the file names to ANSI */ - WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, sizeof(wfd.cFileName), + len = lstrlenW(wfd.cFileName); + WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, len + 1, pfd->cFileName, sizeof(pfd->cFileName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, wfd.cAlternateFileName, sizeof(wfd.cAlternateFileName), + len = lstrlenW(wfd.cAlternateFileName); + WideCharToMultiByte(CP_ACP, 0, wfd.cAlternateFileName, len + 1, pfd->cAlternateFileName, sizeof(pfd->cAlternateFileName), NULL, NULL); } }