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

Backported fix for CORE-1671: atexit() calls in client libraries cause segfaults if the libraries are used in dlopen()ed modules

Browse Source
This commit is contained in:
alexpeshkoff 2008-01-11 12:55:40 +00:00
parent d62045523e
commit a9a93fbc0c
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/jrd/gds.cpp
View File

@ -3465,7 +3465,7 @@ static int blr_print_word(gds_ctl* control)
}
void gds__cleanup(void)
namespace
{
/**************************************
*
@ -3477,34 +3477,42 @@ void gds__cleanup(void)
* Exit handler for image exit.
*
**************************************/
class GdsCleanup
{
public:
~GdsCleanup()
{
if (! initialized)
return;
#ifdef UNIX
if (gds_pid != getpid())
return;
if (gds_pid != getpid())
return;
#endif
gds__msg_close(NULL);
gds__msg_close(NULL);
CLEAN clean;
CLEAN clean;
while ( (clean = cleanup_handlers) )
{
cleanup_handlers = clean->clean_next;
FPTR_VOID_PTR routine = clean->clean_routine;
void* arg = clean->clean_arg;
while (clean = cleanup_handlers) {
cleanup_handlers = clean->clean_next;
FPTR_VOID_PTR routine = clean->clean_routine;
void* arg = clean->clean_arg;
/* We must free the handler before calling it because there
may be a handler (and is) that frees all memory that has
been allocated. */
/* We must free the handler before calling it because there
may be a handler (and is) that frees all memory that has
been allocated. */
FREE_LIB_MEMORY(clean);
FREE_LIB_MEMORY(clean);
(*routine)(arg);
}
(*routine)(arg);
}
initialized = false;
}
};
#ifdef V4_THREADING
/* V4_DESTROY; */
#endif
initialized = false;
}
GdsCleanup cleanupInstance;
} // anonymous namespace
static void init(void)
@ -3567,8 +3575,6 @@ static void init(void)
#endif /* SUPERSERVER */
#endif /* UNIX */
atexit(gds__cleanup);
initialized = true;
gdsPrefixInit();