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

Fixed CORE-3736: WITH LOCK clause is allowed for users with read-only rights on some table, thus blocking others from updating this table

Browse Source
This commit is contained in:
alexpeshkoff 2012-01-19 15:11:32 +00:00
parent 0cf9a89faa
commit 77d484a6da
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jrd/opt.cpp
View File

@ -759,6 +759,23 @@ RecordSource* OPT_compile(thread_db* tdbb, CompilerScratch* csb, RseNode* rse,
if (rse->rse_first)
rsb = FB_NEW(*tdbb->getDefaultPool()) FirstRowsStream(csb, rsb, rse->rse_first);
if (rse->flags & RseNode::FLAG_WRITELOCK)
{
for (USHORT i = 1; i <= opt->compileStreams[0]; ++i)
{
const USHORT loopStream = opt->compileStreams[i];
CompilerScratch::csb_repeat* r = &csb->csb_rpt[loopStream];
r->csb_flags |= csb_update;
if (r->csb_relation)
{
CMP_post_access(tdbb, csb, r->csb_relation->rel_security_name,
r->csb_view ? r->csb_view->rel_id : 0,
SCL_sql_update, SCL_object_table, r->csb_relation->rel_name);
}
}
}
// release memory allocated for index descriptions
for (USHORT i = 1; i <= opt->compileStreams[0]; ++i)
{
@ -796,15 +813,6 @@ RecordSource* OPT_compile(thread_db* tdbb, CompilerScratch* csb, RseNode* rse,
throw;
}
if (rse->flags & RseNode::FLAG_WRITELOCK)
{
for (USHORT i = 1; i <= opt->compileStreams[0]; ++i)
{
const USHORT loopStream = opt->compileStreams[i];
csb->csb_rpt[loopStream].csb_flags |= csb_update;
}
}
return rsb;
}