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

Fixed AV when engine shutdown started during isc_attach_database call execution

Browse Source
This commit is contained in:
hvlad 2009-03-13 09:55:07 +00:00
parent edd4984ffd
commit 0c1e3269b2
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/jrd/jrd.cpp
View File

@ -5991,28 +5991,38 @@ static ISC_STATUS unwindAttach(const Exception& ex,
{
ex.stuff_exception(userStatus);
try
if (engineShuttingDown)
{
ThreadStatusGuard temp_status(tdbb);
dbb->dbb_flags &= ~DBB_being_opened;
// this attachment will be released as part of engine shutdown process
// see also cancel_attachments
if (attachment)
attachment->att_mutex.leave();
}
else
{
try
{
release_attachment(tdbb, attachment, userStatus);
}
ThreadStatusGuard temp_status(tdbb);
if (dbb->checkHandle())
{
if (!dbb->dbb_attachments)
dbb->dbb_flags &= ~DBB_being_opened;
if (attachment)
{
shutdown_database(dbb, true);
release_attachment(tdbb, attachment, userStatus);
}
if (dbb->checkHandle())
{
if (!dbb->dbb_attachments)
{
shutdown_database(dbb, true);
}
}
}
}
catch (const Exception&)
{
// no-op
catch (const Exception&)
{
// no-op
}
}
return userStatus[1];