Skip to content

FIX: Clear unixODBC ini cache at module shutdown (GH#1660) #1667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jahnvi480 wants to merge 1 commit into
base: dev
Choose a base branch
from
+21 −0
Open

FIX: Clear unixODBC ini cache at module shutdown (GH#1660) #1667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions source/shared/core_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#include "core_sqlsrv.h"

#ifndef _WIN32
#include <dlfcn.h>
#endif

// module global variables (initialized in minit and freed in mshutdown)
HMODULE g_sqlsrv_hmodule = NULL;
bool isVistaOrGreater;
Expand Down Expand Up @@ -159,6 +163,23 @@ void core_sqlsrv_mshutdown( _Inout_ sqlsrv_context& henv_cp, _Inout_ sqlsrv_cont
}
delete &henv_cp;

#ifndef _WIN32
// Release the ini file cache allocated by libodbcinst when we called
// SQLGetPrivateProfileString during MINIT (token_cache_init_ttl).
// The ODBC installer library caches parsed ini data internally and
// never frees it, which is reported as a leak by AddressSanitizer.
// __clear_ini_cache is a unixODBC-specific export, so we load it
// dynamically and call it only if available.
void* hInst = dlopen( "libodbcinst.so.2", RTLD_NOW | RTLD_NOLOAD );
if( hInst ) {
void (*clear_cache)(void) = reinterpret_cast<void(*)(void)>( dlsym( hInst, "__clear_ini_cache" ) );
if( clear_cache ) {
clear_cache();
}
dlclose( hInst );
}
#endif

return;
}

Loading