8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:03:02 +01:00

Fixed AV in CS introduced recently. Dmitry, please review.

This commit is contained in:
hvlad 2015-12-01 21:12:31 +00:00
parent 139513291c
commit 6a41c96166

View File

@ -897,7 +897,7 @@ namespace Jrd {
EngineCheckout(thread_db* tdbb, const char* from, bool optional = false)
: m_tdbb(tdbb), m_from(from)
{
Attachment* const att = tdbb->getAttachment();
Attachment* const att = tdbb ? tdbb->getAttachment() : NULL;
if (att)
m_ref = att->getStable();
@ -916,7 +916,7 @@ namespace Jrd {
// If we were signalled to cancel/shutdown, react as soon as possible.
// We cannot throw immediately, but we can reschedule ourselves.
if (m_tdbb->tdbb_quantum > 0 && m_tdbb->checkCancelState())
if (m_tdbb && m_tdbb->tdbb_quantum > 0 && m_tdbb->checkCancelState())
m_tdbb->tdbb_quantum = 0;
}