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

This should fix bug #8114 : Segfault in connections pool during server shutdown

Browse Source
This commit is contained in:
Vlad Khorsun 2024-05-14 11:41:54 +03:00
parent f339eb4a00
commit 47ccf0fc82
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jrd/extds/ExtDS.cpp
View File

@ -905,7 +905,8 @@ void ConnectionsPool::putConnection(thread_db* tdbb, Connection* conn)
fb_assert(conn->getConnPool() == this);
Connection* oldConn = NULL;
bool startIdleTimer = false;
Firebird::RefPtr<IdleTimer> timer;
if (m_maxCount > 0)
{
MutexLockGuard guard(m_mutex, FB_FUNCTION);
@ -977,7 +978,7 @@ void ConnectionsPool::putConnection(thread_db* tdbb, Connection* conn)
if (!m_timer)
m_timer = FB_NEW IdleTimer(*this);
startIdleTimer = true;
timer = m_timer;
}
#ifdef EDS_DEBUG
@ -996,8 +997,10 @@ void ConnectionsPool::putConnection(thread_db* tdbb, Connection* conn)
if (oldConn)
oldConn->getProvider()->releaseConnection(tdbb, *oldConn, false);
if (startIdleTimer)
m_timer->start();
// Note, m_timer could be cleared at this point - due to shutdown.
// Then m_idleList will be empty and start() will do nothing.
if (timer)
timer->start();
}
void ConnectionsPool::addConnection(thread_db* tdbb, Connection* conn, ULONG hash)