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

Backport fix for bug CORE-2632 : Invalid BLOB ID when working with monitoring tables

Browse Source
This commit is contained in:
hvlad 2009-09-16 21:28:14 +00:00
parent 45b461fcac
commit f51d9e5ce7
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/DatabaseSnapshot.cpp
View File

@ -712,6 +712,30 @@ void DatabaseSnapshot::putField(thread_db* tdbb, Record* record, const DumpField
fb_assert(false);
}
// hvlad: detach just created temporary blob from request to bound its
// lifetime to transaction. This is necessary as this blob belongs to
// the MON$ table and must be accessible until transaction ends.
if (DTYPE_IS_BLOB_OR_QUAD(to_desc.dsc_dtype))
{
bid *blob_id = reinterpret_cast<bid*>(to_desc.dsc_address);
jrd_tra *tran = tdbb->getTransaction();
const bool found = tran->tra_blobs.locate(blob_id->bid_temp_id());
fb_assert(found);
BlobIndex &blobIdx = tran->tra_blobs.current();
fb_assert(!blobIdx.bli_materialized);
if (blobIdx.bli_request)
{
const bool found = blobIdx.bli_request->req_blobs.locate(blobIdx.bli_temp_id);
fb_assert(found);
blobIdx.bli_request->req_blobs.fastRemove();
blobIdx.bli_request = NULL;
}
}
CLEAR_NULL(record, field.id);
}