firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fix problem found by Dmitry where node->getDesc is called after parts of csb is released.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-04-06 12:35:51 -03:00
parent 10cbd12c0e
commit 446d4fa392
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/Statement.cpp
View File

@ -226,7 +226,7 @@ Statement::Statement(thread_db* tdbb, MemoryPool* p, CompilerScratch* csb)
} }
// Turn a parsed scratch into a statement. // Turn a parsed scratch into a statement.
Statement* Statement::makeStatement(thread_db* tdbb, CompilerScratch* csb, bool internalFlag) Statement* Statement::makeStatement(thread_db* tdbb, CompilerScratch* csb, bool internalFlag, dsc* exprDesc)
{ {
DEV_BLKCHK(csb, type_csb); DEV_BLKCHK(csb, type_csb);
SET_TDBB(tdbb); SET_TDBB(tdbb);
@ -306,6 +306,12 @@ Statement* Statement::makeStatement(thread_db* tdbb, CompilerScratch* csb, bool
const auto pool = tdbb->getDefaultPool(); const auto pool = tdbb->getDefaultPool();
if (exprDesc)
{
fb_assert(csb->csb_node->getKind() == DmlNode::KIND_VALUE);
static_cast<ValueExprNode*>(csb->csb_node)->getDesc(tdbb, csb, exprDesc);
}
statement = FB_NEW_POOL(*pool) Statement(tdbb, pool, csb); statement = FB_NEW_POOL(*pool) Statement(tdbb, pool, csb);
tdbb->setRequest(old_request); tdbb->setRequest(old_request);

2
src/jrd/Statement.h
View File

@ -45,7 +45,7 @@ private:
Statement(thread_db* tdbb, MemoryPool* p, CompilerScratch* csb); Statement(thread_db* tdbb, MemoryPool* p, CompilerScratch* csb);
public: public:
static Statement* makeStatement(thread_db* tdbb, CompilerScratch* csb, bool internalFlag); static Statement* makeStatement(thread_db* tdbb, CompilerScratch* csb, bool internalFlag, dsc* exprDesc = nullptr);
static Request* makeRequest(thread_db* tdbb, CompilerScratch* csb, bool internalFlag); static Request* makeRequest(thread_db* tdbb, CompilerScratch* csb, bool internalFlag);
StmtNumber getStatementId() const StmtNumber getStatementId() const

6
src/jrd/dfw.epp
View File

@ -2760,8 +2760,11 @@ static bool create_expression_index(thread_db* tdbb, SSHORT phase, DeferredWork*
{ {
idx.idx_expression = static_cast<ValueExprNode*>(MET_get_dependencies( idx.idx_expression = static_cast<ValueExprNode*>(MET_get_dependencies(
tdbb, relation, NULL, 0, NULL, &IDX.RDB$EXPRESSION_BLR, tdbb, relation, NULL, 0, NULL, &IDX.RDB$EXPRESSION_BLR,
&idx.idx_expression_statement, &csb, work->dfw_name, obj_expression_index, 0, nullptr, &csb, work->dfw_name, obj_expression_index, 0,
transaction)); transaction));
idx.idx_expression_statement = Statement::makeStatement(tdbb, csb, false,
&idx.idx_expression_desc);
} }
} // end scope } // end scope
@ -2769,7 +2772,6 @@ static bool create_expression_index(thread_db* tdbb, SSHORT phase, DeferredWork*
idx.idx_count = 1; idx.idx_count = 1;
idx.idx_flags |= idx_expressn; idx.idx_flags |= idx_expressn;
idx.idx_expression->getDesc(tdbb, csb, &idx.idx_expression_desc);
idx.idx_rpt[0].idx_itype = idx.idx_rpt[0].idx_itype =
DFW_assign_index_type(tdbb, work->dfw_name, DFW_assign_index_type(tdbb, work->dfw_name,
idx.idx_expression_desc.dsc_dtype, idx.idx_expression_desc.dsc_dtype,

9
src/jrd/met.epp
View File

@ -2620,16 +2620,17 @@ void MET_lookup_index_expression(thread_db* tdbb, jrd_rel* relation, index_desc*
{ // scope { // scope
Jrd::ContextPoolHolder context(tdbb, attachment->createPool()); Jrd::ContextPoolHolder context(tdbb, attachment->createPool());
idx->idx_expression = static_cast<ValueExprNode*>(MET_parse_blob( idx->idx_expression = static_cast<ValueExprNode*>(MET_parse_blob(
tdbb, relation, &IDX.RDB$EXPRESSION_BLR, &csb, tdbb, relation, &IDX.RDB$EXPRESSION_BLR, &csb,
&idx->idx_expression_statement, false, false)); nullptr, false, false));
idx->idx_expression_statement = Statement::makeStatement(tdbb, csb, false,
&idx->idx_expression_desc);
} // end scope } // end scope
} }
END_FOR END_FOR
if (csb)
idx->idx_expression->getDesc(tdbb, csb, &idx->idx_expression_desc);
delete csb; delete csb;
// if there is no existing index block for this index, create // if there is no existing index block for this index, create