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

Fixed the underlying issue that made CORE-4255 possible.

Browse Source
This commit is contained in:
dimitr 2013-11-07 18:41:27 +00:00
parent 2f00756b93
commit d0d26c6622
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/jrd/evl.cpp
View File

@ -258,19 +258,34 @@ RecordBitmap** EVL_bitmap(thread_db* tdbb, const InversionNode* node, RecordBitm
RecordBitmap::reset(impure->inv_bitmap);
const dsc* desc = EVL_expr(tdbb, request, node->value);
if (!(tdbb->getRequest()->req_flags & req_null) &&
desc->dsc_length == sizeof(RecordNumber::Packed))
if (!(tdbb->getRequest()->req_flags & req_null))
{
const USHORT id = node->id;
Aligner<RecordNumber::Packed> alignedNumbers(desc->dsc_address, desc->dsc_length);
const RecordNumber::Packed* numbers = alignedNumbers;
RecordNumber rel_dbkey;
rel_dbkey.bid_decode(&numbers[id]);
// Decrement the value in order to switch back to the zero based numbering
// (from the user point of view the DB_KEY numbering starts from one)
rel_dbkey.decrement();
if (!bitmap_and || bitmap_and->test(rel_dbkey.getValue()))
RBM_SET(tdbb->getDefaultPool(), &impure->inv_bitmap, rel_dbkey.getValue());
UCHAR* ptr = NULL;
USHORT length = 0;
if (desc->dsc_dtype == dtype_dbkey)
{
ptr = desc->dsc_address;
length = desc->dsc_length;
}
else if (desc->isText())
{
length = MOV_get_string(desc, &ptr, NULL, 0);
}
if (length == sizeof(RecordNumber::Packed))
{
const USHORT id = node->id;
Aligner<RecordNumber::Packed> alignedNumbers(ptr, length);
const RecordNumber::Packed* numbers = alignedNumbers;
RecordNumber rel_dbkey;
rel_dbkey.bid_decode(&numbers[id]);
// Decrement the value in order to switch back to the zero based numbering
// (from the user point of view the DB_KEY numbering starts from one)
rel_dbkey.decrement();
if (!bitmap_and || bitmap_and->test(rel_dbkey.getValue()))
RBM_SET(tdbb->getDefaultPool(), &impure->inv_bitmap, rel_dbkey.getValue());
}
}
return &impure->inv_bitmap;