firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:03:02 +01:00
Code Issues

Postfix for CORE-5474, more generic way to check for actual library name

Browse Source
This commit is contained in:
AlexPeshkoff 2019-05-24 20:02:30 +03:00
parent e697710ae4
commit 761a8f811d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/os/posix/mod_loader.cpp
View File

@ -131,16 +131,25 @@ void* DlfcnModule::findSymbol(const Firebird::string& symName)
result = dlsym(module, newSym.c_str()); result = dlsym(module, newSym.c_str());
} }
if (!result)
return NULL;
#ifdef HAVE_DLADDR #ifdef HAVE_DLADDR
if (!PathUtils::isRelative(fileName))
{
Dl_info info; Dl_info info;
if (!dladdr(result, &info)) if (!dladdr(result, &info))
return NULL; return NULL;
if (fileName != info.dli_fname)
if (PathUtils::isRelative(fileName) || PathUtils::isRelative(info.dli_fname))
{
// check only name (not path) of the library
Firebird::PathName dummyDir, nm1, nm2;
PathUtils::splitLastComponent(dummyDir, nm1, fileName);
PathUtils::splitLastComponent(dummyDir, nm2, info.dli_fname);
if (nm1 != nm2)
return NULL; return NULL;
} }
else if (fileName != info.dli_fname)
return NULL;
#endif #endif
return result; return result;