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

Fixed CORE-2900 - "AV - The code attempted to access a virtual address without privilege to do so" using aggregate distinct

Browse Source
This commit is contained in:
asfernandes 2010-06-16 11:47:19 +00:00
parent 4532058a72
commit f70830ba40
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jrd/evl.cpp
View File

@ -1756,9 +1756,10 @@ USHORT EVL_group(thread_db* tdbb, RecordSource* rsb, jrd_nod *const node, USHORT
desc, &to, INTL_KEY_UNIQUE); desc, &to, INTL_KEY_UNIQUE);
} }
asb->asb_desc.dsc_address = data + dsc toDesc = asb->asb_desc;
toDesc.dsc_address = data +
(asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0); (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
MOV_move(tdbb, desc, &asb->asb_desc); MOV_move(tdbb, desc, &toDesc);
break; break;
} }
@ -3020,7 +3021,7 @@ static void compute_agg_distinct(thread_db* tdbb, jrd_nod* node)
const size_t asb_index = (node->nod_type == nod_agg_list_distinct) ? 2 : 1; const size_t asb_index = (node->nod_type == nod_agg_list_distinct) ? 2 : 1;
AggregateSort* asb = (AggregateSort*) node->nod_arg[asb_index]; AggregateSort* asb = (AggregateSort*) node->nod_arg[asb_index];
impure_agg_sort* asb_impure = (impure_agg_sort*) ((SCHAR *) request + asb->nod_impure); impure_agg_sort* asb_impure = (impure_agg_sort*) ((SCHAR *) request + asb->nod_impure);
dsc* desc = &asb->asb_desc; dsc desc = asb->asb_desc;
impure_value_ex* impure = (impure_value_ex*) ((SCHAR *) request + node->nod_impure); impure_value_ex* impure = (impure_value_ex*) ((SCHAR *) request + node->nod_impure);
/* Sort the values already "put" to sort */ /* Sort the values already "put" to sort */
@ -3044,20 +3045,20 @@ static void compute_agg_distinct(thread_db* tdbb, jrd_nod* node)
break; break;
} }
desc->dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0); desc.dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
switch (node->nod_type) switch (node->nod_type)
{ {
case nod_agg_total_distinct: case nod_agg_total_distinct:
case nod_agg_average_distinct: case nod_agg_average_distinct:
++impure->vlux_count; ++impure->vlux_count;
add(desc, node, impure); add(&desc, node, impure);
break; break;
case nod_agg_total_distinct2: case nod_agg_total_distinct2:
case nod_agg_average_distinct2: case nod_agg_average_distinct2:
++impure->vlux_count; ++impure->vlux_count;
add2(desc, node, impure); add2(&desc, node, impure);
break; break;
case nod_agg_count_distinct: case nod_agg_count_distinct:
@ -3071,7 +3072,7 @@ static void compute_agg_distinct(thread_db* tdbb, jrd_nod* node)
{ {
impure->vlu_blob = BLB_create(tdbb, tdbb->getRequest()->req_transaction, impure->vlu_blob = BLB_create(tdbb, tdbb->getRequest()->req_transaction,
&impure->vlu_misc.vlu_bid); &impure->vlu_misc.vlu_bid);
impure->vlu_desc.makeBlob(desc->getBlobSubType(), desc->getTextType(), impure->vlu_desc.makeBlob(desc.getBlobSubType(), desc.getTextType(),
(ISC_QUAD* ) &impure->vlu_misc.vlu_bid); (ISC_QUAD* ) &impure->vlu_misc.vlu_bid);
} }
@ -3090,7 +3091,7 @@ static void compute_agg_distinct(thread_db* tdbb, jrd_nod* node)
BLB_put_data(tdbb, impure->vlu_blob, temp, len); BLB_put_data(tdbb, impure->vlu_blob, temp, len);
} }
++impure->vlux_count; ++impure->vlux_count;
len = MOV_make_string2(tdbb, desc, impure->vlu_desc.getTextType(), &temp, buffer, false); len = MOV_make_string2(tdbb, &desc, impure->vlu_desc.getTextType(), &temp, buffer, false);
BLB_put_data(tdbb, impure->vlu_blob, temp, len); BLB_put_data(tdbb, impure->vlu_blob, temp, len);
break; break;
} }