lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

If a non-global dlopen happens, check for loaded libraries. Closes #1114

Browse Source
This commit is contained in:
baldurk
2018-09-27 11:38:27 +01:00
parent de4bf9711c
commit 6f1a458c8a
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/linux/linux_hook.cpp
+33 -23
View File
@@ -83,6 +83,33 @@ void plthook_lib(void *handle)
plthook_close(plthook);
}
static void CheckLoadedLibraries()
{
// iterate over the libraries and see which ones are already loaded, process function hooks for
// them and call callbacks.
for(auto it = libraryHooks.begin(); it != libraryHooks.end(); ++it)
{
std::string libName = *it;
void *handle = realdlopen(libName.c_str(), RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);
if(handle)
{
for(FunctionHook &hook : functionHooks)
{
if(hook.orig && *hook.orig == NULL)
*hook.orig = dlsym(handle, hook.function.c_str());
}
for(FunctionLoadCallback cb : libraryCallbacks[libName])
if(cb)
cb(handle);
// don't call callbacks again if the library is dlopen'd again
libraryCallbacks[libName].clear();
}
}
}
void *intercept_dlopen(const char *filename, int flag, void *ret)
{
if(filename == NULL)
@@ -118,6 +145,11 @@ void *intercept_dlopen(const char *filename, int flag, void *ret)
}
}
// for local library loads, this library might depend on one we care about, so check again as we
// did in EndHookRegistration to see if any library has been loaded.
if((flag & RTLD_GLOBAL) == 0)
CheckLoadedLibraries();
return ret;
}
@@ -138,29 +170,7 @@ void LibraryHooks::RemoveHooks()
void LibraryHooks::EndHookRegistration()
{
// iterate over the libraries and see which ones are already loaded, process function hooks for
// them and call callbacks.
for(auto it = libraryHooks.begin(); it != libraryHooks.end(); ++it)
{
std::string libName = *it;
void *handle = realdlopen(libName.c_str(), RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);
if(handle)
{
for(FunctionHook &hook : functionHooks)
{
if(hook.orig && *hook.orig == NULL)
*hook.orig = dlsym(handle, hook.function.c_str());
}
for(FunctionLoadCallback cb : libraryCallbacks[libName])
if(cb)
cb(handle);
// don't call callbacks again if the library is dlopen'd again
libraryCallbacks[libName].clear();
}
}
CheckLoadedLibraries();
}
void LibraryHooks::Refresh()