mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-22 12:33:33 +02:00
Do not leak OpenedHandles.
llvm-svn: 296748
This commit is contained in:
parent
729924f526
commit
84e29fb5b4
@ -9,8 +9,6 @@
|
||||
//
|
||||
// This file provides the Win32 specific implementation of DynamicLibrary.
|
||||
//
|
||||
// FIXME: This file leaks OpenedHandles!
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "WindowsSupport.h"
|
||||
@ -35,7 +33,7 @@ using namespace sys;
|
||||
|
||||
typedef BOOL (WINAPI *fpEnumerateLoadedModules)(HANDLE,PENUMLOADED_MODULES_CALLBACK64,PVOID);
|
||||
static fpEnumerateLoadedModules fEnumerateLoadedModules;
|
||||
static DenseSet<HMODULE> *OpenedHandles;
|
||||
static llvm::ManagedStatic<DenseSet<HMODULE> > OpenedHandles;
|
||||
|
||||
static bool loadDebugHelp(void) {
|
||||
HMODULE hLib = ::LoadLibraryW(L"Dbghelp.dll");
|
||||
@ -59,9 +57,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
||||
|
||||
if (!filename) {
|
||||
// When no file is specified, enumerate all DLLs and EXEs in the process.
|
||||
if (OpenedHandles == 0)
|
||||
OpenedHandles = new DenseSet<HMODULE>();
|
||||
|
||||
if (!fEnumerateLoadedModules) {
|
||||
if (!loadDebugHelp()) {
|
||||
assert(false && "These APIs should always be available");
|
||||
@ -89,9 +84,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
||||
return DynamicLibrary();
|
||||
}
|
||||
|
||||
if (OpenedHandles == 0)
|
||||
OpenedHandles = new DenseSet<HMODULE>();
|
||||
|
||||
// If we've already loaded this library, FreeLibrary() the handle in order to
|
||||
// keep the internal refcount at +1.
|
||||
if (!OpenedHandles->insert(a_handle).second)
|
||||
@ -137,7 +129,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
|
||||
}
|
||||
|
||||
// Now search the libraries.
|
||||
if (OpenedHandles) {
|
||||
if (OpenedHandles.isConstructed()) {
|
||||
for (DenseSet<HMODULE>::iterator I = OpenedHandles->begin(),
|
||||
E = OpenedHandles->end(); I != E; ++I) {
|
||||
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
|
||||
|
Loading…
Reference in New Issue
Block a user