Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 14:13:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

LoadLibraryExW: After loading a library as a datafile, clean up properly (don't leak SearchPath, and don't free DllName if we didn't allocate it)

Browse source 
svn path=/trunk/; revision=42163
This commit is contained in:
Jeffrey Morlan 2009-07-23 20:48:43 +00:00
parent c3f828c7ee
commit 91de7b5fd3
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/kernel32/misc/ldr.c
View file

@ -266,14 +266,7 @@ LoadLibraryExW (
* 'native' libraries only * 'native' libraries only
*/ */
Status = LoadLibraryAsDatafile(SearchPath, DllName.Buffer, &hInst); Status = LoadLibraryAsDatafile(SearchPath, DllName.Buffer, &hInst);
RtlFreeUnicodeString(&DllName); goto done;
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus(Status);
return NULL;
}
return hInst;
} }
} }
@ -292,6 +285,7 @@ LoadLibraryExW (
Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst); Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst);
} }
done:
RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath); RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath);
if (FreeString) if (FreeString)
RtlFreeUnicodeString(&DllName); RtlFreeUnicodeString(&DllName);