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

Another addition to the my recent patch (AV related with EDS)

Browse Source
This commit is contained in:
hvlad 2018-04-27 16:42:54 +03:00
parent 52da531861
commit 114e4fdf3c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,7 +464,15 @@ void Connection::clearTransactions(Jrd::thread_db* tdbb)
while (m_transactions.getCount())
{
Transaction* tran = m_transactions[0];
tran->rollback(tdbb, false);
try
{
tran->rollback(tdbb, false);
}
catch (const Exception&)
{
if (!m_deleting)
throw;
}
}
}
@ -751,6 +759,7 @@ void Transaction::detachFromJrdTran()
return;
Transaction** tran_ptr = &m_jrdTran->tra_ext_common;
m_jrdTran = NULL;
for (; *tran_ptr; tran_ptr = &(*tran_ptr)->m_nextTran)
{
if (*tran_ptr == this)