Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32] Improve path name handling

Browse source 
Fixes GCC 8 warning:
dll/win32/kernel32/client/loader.c: In function 'LoadLibraryA':
dll/win32/kernel32/client/loader.c:129:17: error: 'strncat' specified bound 13 equals source length [-Werror=stringop-overflow=]
                 strncat(PathBuffer, "\\twain_32.dll", 13);
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Timo Kreuzer 2019-04-27 18:58:08 +02:00
parent cdca4e9036
commit 1b70ddd834
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/kernel32/client/loader.c
View file

@ -110,23 +110,25 @@ WINAPI
DECLSPEC_HOTPATCH
LoadLibraryA(LPCSTR lpLibFileName)
{
static const CHAR TwainDllName[] = "twain_32.dll";
LPSTR PathBuffer;
UINT Len;
HINSTANCE Result;
/* Treat twain_32.dll in a special way (what a surprise...) */
if (lpLibFileName && !_strcmpi(lpLibFileName, "twain_32.dll"))
if (lpLibFileName && !_strcmpi(lpLibFileName, TwainDllName))
{
/* Allocate space for the buffer */
PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, MAX_PATH);
PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, MAX_PATH + sizeof(ANSI_NULL));
if (PathBuffer)
{
/* Get windows dir in this buffer */
Len = GetWindowsDirectoryA(PathBuffer, MAX_PATH - 13); /* 13 is sizeof of '\\twain_32.dll' */
if (Len && Len < (MAX_PATH - 13))
Len = GetWindowsDirectoryA(PathBuffer, MAX_PATH);
if ((Len != 0) && (Len < (MAX_PATH - sizeof(TwainDllName) - sizeof('\\'))))
{
/* We successfully got windows directory. Concatenate twain_32.dll to it */
strncat(PathBuffer, "\\twain_32.dll", 13);
PathBuffer[Len] = '\\';
strcpy(&PathBuffer[Len + 1], TwainDllName);
/* And recursively call ourselves with a new string */
Result = LoadLibraryA(PathBuffer);